CVSROOT: /cvs/cluster
Module name: conga
Changes by: [EMAIL PROTECTED] 2007-09-18 20:30:58
Modified files:
ricci/modules/cluster: ClusterConf.h
ricci/modules/rpm: PackageHandler.cpp RpmModule.cpp
Log message:
Fix a couple of compile-time errors
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/ClusterConf.h.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/rpm/PackageHandler.cpp.diff?cvsroot=cluster&r1=1.16&r2=1.17
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/rpm/RpmModule.cpp.diff?cvsroot=cluster&r1=1.5&r2=1.6
--- conga/ricci/modules/cluster/ClusterConf.h 2007/09/18 20:17:16 1.6
+++ conga/ricci/modules/cluster/ClusterConf.h 2007/09/18 20:30:58 1.7
@@ -1,5 +1,5 @@
/*
-** Copyright Red Hat, Inc. 2005-2007
+** Copyright (C) Red Hat, Inc. 2005-2007
**
** This program is free software; you can redistribute it and/or modify it
** under the terms of the GNU General Public License version 2 as
--- conga/ricci/modules/rpm/PackageHandler.cpp 2007/09/11 18:59:42 1.16
+++ conga/ricci/modules/rpm/PackageHandler.cpp 2007/09/18 20:30:58 1.17
@@ -610,9 +610,10 @@
String name(iter->name);
map<String, PackageSet>::iterator set_iter =
h_pre.sets().find(name);
- if (set_iter == h_pre.sets().end())
- throw String("packages of set ") + name + " present
neither locally nor in repository";
- else {
+ if (set_iter == h_pre.sets().end()) {
+ throw String("packages of set ") + name
+ + " present neither locally nor in
repository";
+ } else {
PackageSet& p_set = set_iter->second;
if (p_set.installed) {
// already installed
@@ -625,9 +626,10 @@
name_iter++)
{
rpms.push_back(*name_iter);
- } else {
- throw
String("packages of set ") + name + " are not present in any available
repository";
}
+ } else {
+ throw String("packages
of set ") + name +
+ " are not
present in any available repository";
}
}
}
@@ -635,9 +637,9 @@
// not installed
if (p_set.in_repo) {
for (list<String>::const_iterator
- name_iter =
p_set.packages.begin() ;
- name_iter !=
p_set.packages.end() ;
- name_iter++)
+ name_iter =
p_set.packages.begin() ;
+ name_iter !=
p_set.packages.end() ;
+ name_iter++)
{
rpms.push_back(*name_iter);
}
--- conga/ricci/modules/rpm/RpmModule.cpp 2007/09/11 18:59:42 1.5
+++ conga/ricci/modules/rpm/RpmModule.cpp 2007/09/18 20:30:58 1.6
@@ -108,8 +108,9 @@
}
}
}
+ PackageHandler::install(rpms, sets, upgrade);
+ }
- PackageHandler::install(rpms, sets, upgrade);
return VarMap();
}
