* [Cluster-devel] conga/ricci/modules/rpm PackageHandler.cpp
@ 2006-09-26 0:56 kupcevic
0 siblings, 0 replies; 9+ messages in thread
From: kupcevic @ 2006-09-26 0:56 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Changes by: kupcevic at sourceware.org 2006-09-26 00:56:13
Modified files:
ricci/modules/rpm: PackageHandler.cpp
Log message:
rpm module: fix of RHEL5 support
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/rpm/PackageHandler.cpp.diff?cvsroot=cluster&r1=1.5&r2=1.6
--- conga/ricci/modules/rpm/PackageHandler.cpp 2006/08/15 00:06:48 1.5
+++ conga/ricci/modules/rpm/PackageHandler.cpp 2006/09/26 00:56:13 1.6
@@ -66,7 +66,8 @@
if (access("/etc/sysconfig/rhn/systemid", F_OK))
rhn_available = false;
// check if there are subscribed channels
- if (rhn_available) {
+ if (rhn_available &&
+ RHEL4) {
String out, err;
int status;
vector<String> args;
@@ -92,13 +93,10 @@
if (!available())
return rpms;
- String out, err;
- int status;
- vector<String> args;
-
- if (RHEL4 || RHEL5) {
- out = err = "";
- args.clear();
+ if (RHEL4) {
+ String out, err;
+ int status;
+ vector<String> args;
args.push_back("--showall");
if (utils::execute(UP2DATE_PATH, args, out, err, status, false))
throw String("execute failed");
@@ -119,9 +117,10 @@
rpms[name] = version;
}
- } else if (FC5 || FC6) {
- out = err = "";
- args.clear();
+ } else if (FC5 || FC6 || RHEL5) {
+ String out, err;
+ int status;
+ vector<String> args;
args.push_back("-y");
args.push_back("list");
args.push_back("all");
@@ -159,13 +158,10 @@
if (rpms.empty())
return true;
- String out, err;
- int status;
- vector<String> args;
-
- if (RHEL4 || RHEL5) {
- out = err = "";
- args.clear();
+ if (RHEL4) {
+ String out, err;
+ int status;
+ vector<String> args;
for (vector<String>::size_type i=0; i<rpms.size(); i++)
args.push_back(rpms[i]);
if (utils::execute(UP2DATE_PATH, args, out, err, status, true))
@@ -174,17 +170,18 @@
throw String(UP2DATE_PATH) + " failed";
return true;
- } else if (FC5 || FC6) {
+ } else if (FC5 || FC6 || RHEL5) {
// install
vector<String> rpms_to_install;
- out = err = "";
- args.clear();
+ String out, err;
+ int status;
+ vector<String> args;
args.push_back("-y");
args.push_back("list");
args.push_back("installed");
if (utils::execute(YUM_PATH, args, out, err, status, false))
throw String("execute failed");
- if (status != 0)
+ if (status)
return false;
vector<String> lines = utils::split(utils::strip(out), "\n");
for (vector<String>::const_iterator rpm = rpms.begin();
@@ -213,7 +210,7 @@
args.push_back(*rpm);
if (utils::execute(YUM_PATH, args, out, err, status, false))
throw String("execute failed");
- if (status != 0)
+ if (status)
return false;
}
// update
@@ -227,9 +224,7 @@
args.push_back(*rpm);
if (utils::execute(YUM_PATH, args, out, err, status, false))
throw String("execute failed");
- if (status != 0)
- return false;
- return true;
+ return !status;
} else
return false;
@@ -500,9 +495,11 @@
}
} else if (RHEL5 || FC6) {
set.packages.push_back("gfs2-utils");
-
- // TODO: implement GFS1
-
+ // GFS1 not present on FC6
+ if (RHEL5) {
+ set.packages.push_back("gfs-utils");
+ set.packages.push_back("kmod-gfs");
+ }
}
return set;
@@ -625,8 +622,7 @@
is.read(buff, length);
String rel(buff, length);
- delete [] buff;
- buff = 0;
+ delete [] buff; buff = 0;
release = utils::strip(rel);
} catch ( ... ) {
@@ -640,9 +636,12 @@
FC5 = true;
else if (release.find("Fedora Core") != release.npos &&
release.find("6") != release.npos)
- // TODO: detect FC6
+ // TODO: get real FC6 codename
FC6 = true;
- // TODO: detect RHEL5
+ else if (release.find("Tikanga") != release.npos)
+ RHEL5 = true;
+ else
+ throw String("Unsupported OS");
release_set = true;
}
^ permalink raw reply [flat|nested] 9+ messages in thread* [Cluster-devel] conga/ricci/modules/rpm PackageHandler.cpp
@ 2006-10-11 22:33 kupcevic
0 siblings, 0 replies; 9+ messages in thread
From: kupcevic @ 2006-10-11 22:33 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Changes by: kupcevic at sourceware.org 2006-10-11 22:33:43
Modified files:
ricci/modules/rpm: PackageHandler.cpp
Log message:
rpm module: don't upgrade packages
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/rpm/PackageHandler.cpp.diff?cvsroot=cluster&r1=1.7&r2=1.8
--- conga/ricci/modules/rpm/PackageHandler.cpp 2006/10/06 03:10:13 1.7
+++ conga/ricci/modules/rpm/PackageHandler.cpp 2006/10/11 22:33:43 1.8
@@ -152,12 +152,12 @@
bool
PackageInstaller::install(vector<String> rpms)
{
- if (!available())
- return rpms.empty();
-
if (rpms.empty())
return true;
+ //if (!available())
+ // return rpms.empty();
+
if (RHEL4) {
String out, err;
int status;
@@ -213,6 +213,8 @@
if (status)
return false;
}
+ return true;
+ /*
// update
out = err = "";
args.clear();
@@ -225,7 +227,7 @@
if (utils::execute(YUM_PATH, args, out, err, status, false))
throw command_not_found_error_msg(YUM_PATH);
return !status;
-
+ */
} else
return false;
}
^ permalink raw reply [flat|nested] 9+ messages in thread* [Cluster-devel] conga/ricci/modules/rpm PackageHandler.cpp
@ 2007-02-05 11:10 kupcevic
0 siblings, 0 replies; 9+ messages in thread
From: kupcevic @ 2007-02-05 11:10 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Branch: RHEL4
Changes by: kupcevic at sourceware.org 2007-02-05 11:10:43
Modified files:
ricci/modules/rpm: PackageHandler.cpp
Log message:
modrpm: enable up2date handling
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/rpm/PackageHandler.cpp.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.11&r2=1.11.2.1
--- conga/ricci/modules/rpm/PackageHandler.cpp 2006/12/13 19:33:14 1.11
+++ conga/ricci/modules/rpm/PackageHandler.cpp 2007/02/05 11:10:43 1.11.2.1
@@ -26,6 +26,7 @@
#include "File.h"
#include <unistd.h>
+#include <sys/utsname.h>
using namespace std;
@@ -154,10 +155,6 @@
return true;
if (RHEL4) {
-
- // TODO: fix up2date handling
- throw String("RHEL4 not supported, yet");
-
String out, err;
int status;
vector<String> args;
@@ -416,7 +413,9 @@
set.packages.push_back("dlm");
set.packages.push_back("fence");
- String kernel(utils::strip(File::open("/proc/sys/kernel/osrelease")));
+ struct utsname uts;
+ uname(&uts);
+ String kernel(uts.release);
if (kernel.find("smp") != kernel.npos) {
set.packages.push_back("cman-kernel-smp");
set.packages.push_back("dlm-kernel-smp");
@@ -464,7 +463,9 @@
PackageSet
PackageHandler::build_cluster_storage_set()
{
- String kernel(utils::strip(File::open("/proc/sys/kernel/osrelease")));
+ struct utsname uts;
+ uname(&uts);
+ String kernel(uts.release);
PackageSet set("Clustered Storage");
set.packages.push_back("lvm2-cluster");
@@ -523,10 +524,9 @@
const Package& pack = iter->second;
if (pack.version.empty())
set.installed = false;
- if (pack.repo_version.empty()) {
+ if (pack.repo_version.empty())
set.in_repo = false;
- set.upgradeable = false;
- } else if (pack.repo_version > pack.version)
+ else if (pack.repo_version > pack.version)
set.upgradeable = true;
}
}
^ permalink raw reply [flat|nested] 9+ messages in thread* [Cluster-devel] conga/ricci/modules/rpm PackageHandler.cpp
@ 2007-02-05 21:29 rmccabe
0 siblings, 0 replies; 9+ messages in thread
From: rmccabe @ 2007-02-05 21:29 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Branch: RHEL4
Changes by: rmccabe at sourceware.org 2007-02-05 21:29:57
Modified files:
ricci/modules/rpm: PackageHandler.cpp
Log message:
More fenced removal stuff for GULM clusters.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/rpm/PackageHandler.cpp.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.11.2.1&r2=1.11.2.2
--- conga/ricci/modules/rpm/PackageHandler.cpp 2007/02/05 11:10:43 1.11.2.1
+++ conga/ricci/modules/rpm/PackageHandler.cpp 2007/02/05 21:29:57 1.11.2.2
@@ -441,7 +441,6 @@
if (RHEL4 || FC5) {
set.packages.push_back("ccs");
set.packages.push_back("gulm");
- set.packages.push_back("fence");
} else
throw String("GULM not available in CS5");
^ permalink raw reply [flat|nested] 9+ messages in thread* [Cluster-devel] conga/ricci/modules/rpm PackageHandler.cpp
@ 2007-02-05 22:19 kupcevic
0 siblings, 0 replies; 9+ messages in thread
From: kupcevic @ 2007-02-05 22:19 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Changes by: kupcevic at sourceware.org 2007-02-05 22:19:12
Modified files:
ricci/modules/rpm: PackageHandler.cpp
Log message:
modrpm: enable up2date handling
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/rpm/PackageHandler.cpp.diff?cvsroot=cluster&r1=1.12&r2=1.13
--- conga/ricci/modules/rpm/PackageHandler.cpp 2007/02/05 19:52:44 1.12
+++ conga/ricci/modules/rpm/PackageHandler.cpp 2007/02/05 22:19:12 1.13
@@ -26,6 +26,7 @@
#include "File.h"
#include <unistd.h>
+#include <sys/utsname.h>
using namespace std;
@@ -154,10 +155,6 @@
return true;
if (RHEL4) {
-
- // TODO: fix up2date handling
- throw String("RHEL4 not supported, yet");
-
String out, err;
int status;
vector<String> args;
@@ -416,7 +413,9 @@
set.packages.push_back("dlm");
set.packages.push_back("fence");
- String kernel(utils::strip(File::open("/proc/sys/kernel/osrelease")));
+ struct utsname uts;
+ uname(&uts);
+ String kernel(uts.release);
if (kernel.find("smp") != kernel.npos) {
set.packages.push_back("cman-kernel-smp");
set.packages.push_back("dlm-kernel-smp");
@@ -463,7 +462,9 @@
PackageSet
PackageHandler::build_cluster_storage_set()
{
- String kernel(utils::strip(File::open("/proc/sys/kernel/osrelease")));
+ struct utsname uts;
+ uname(&uts);
+ String kernel(uts.release);
PackageSet set("Clustered Storage");
set.packages.push_back("lvm2-cluster");
@@ -522,10 +523,9 @@
const Package& pack = iter->second;
if (pack.version.empty())
set.installed = false;
- if (pack.repo_version.empty()) {
+ if (pack.repo_version.empty())
set.in_repo = false;
- set.upgradeable = false;
- } else if (pack.repo_version > pack.version)
+ else if (pack.repo_version > pack.version)
set.upgradeable = true;
}
}
^ permalink raw reply [flat|nested] 9+ messages in thread* [Cluster-devel] conga/ricci/modules/rpm PackageHandler.cpp
@ 2007-03-03 5:15 rmccabe
0 siblings, 0 replies; 9+ messages in thread
From: rmccabe @ 2007-03-03 5:15 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Changes by: rmccabe at sourceware.org 2007-03-03 05:15:32
Modified files:
ricci/modules/rpm: PackageHandler.cpp
Log message:
yum repo names may contain spaces, so the != 3 check will cause packages in repositories whose name contains a space to be omitted from the package list. Change the check to l < 3, as we don't care what the repository is called, just what the package's name and version are.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/rpm/PackageHandler.cpp.diff?cvsroot=cluster&r1=1.13&r2=1.14
--- conga/ricci/modules/rpm/PackageHandler.cpp 2007/02/05 22:19:12 1.13
+++ conga/ricci/modules/rpm/PackageHandler.cpp 2007/03/03 05:15:32 1.14
@@ -133,7 +133,7 @@
line = utils::strip(line);
vector<String> words = utils::split(line);
vector<String>::size_type l = words.size();
- if (l != 3)
+ if (l < 3)
continue;
String name = words[0];
String::size_type idx = name.rfind('.');
^ permalink raw reply [flat|nested] 9+ messages in thread* [Cluster-devel] conga/ricci/modules/rpm PackageHandler.cpp
@ 2007-03-03 5:16 rmccabe
0 siblings, 0 replies; 9+ messages in thread
From: rmccabe @ 2007-03-03 5:16 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Branch: RHEL4
Changes by: rmccabe at sourceware.org 2007-03-03 05:16:58
Modified files:
ricci/modules/rpm: PackageHandler.cpp
Log message:
yum repo names may contain spaces, so the != 3 check will cause packages in repositories whose name contains a space to be omitted from the package list. Change the check to l < 3, as we don't care what the repository is called, just what the package's name and version are.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/rpm/PackageHandler.cpp.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.11.2.2&r2=1.11.2.3
--- conga/ricci/modules/rpm/PackageHandler.cpp 2007/02/05 21:29:57 1.11.2.2
+++ conga/ricci/modules/rpm/PackageHandler.cpp 2007/03/03 05:16:58 1.11.2.3
@@ -133,7 +133,7 @@
line = utils::strip(line);
vector<String> words = utils::split(line);
vector<String>::size_type l = words.size();
- if (l != 3)
+ if (l < 3)
continue;
String name = words[0];
String::size_type idx = name.rfind('.');
^ permalink raw reply [flat|nested] 9+ messages in thread* [Cluster-devel] conga/ricci/modules/rpm PackageHandler.cpp
@ 2007-03-03 5:18 rmccabe
0 siblings, 0 replies; 9+ messages in thread
From: rmccabe @ 2007-03-03 5:18 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Branch: RHEL5
Changes by: rmccabe at sourceware.org 2007-03-03 05:18:18
Modified files:
ricci/modules/rpm: PackageHandler.cpp
Log message:
yum repo names may contain spaces, so the != 3 check will cause packages in repositories whose name contains a space to be omitted from the package list. Change the check to l < 3, as we don't care what the repository is called, just what the package's name and version are.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/rpm/PackageHandler.cpp.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.9.2.3&r2=1.9.2.4
--- conga/ricci/modules/rpm/PackageHandler.cpp 2007/03/01 00:31:20 1.9.2.3
+++ conga/ricci/modules/rpm/PackageHandler.cpp 2007/03/03 05:18:17 1.9.2.4
@@ -133,7 +133,7 @@
line = utils::strip(line);
vector<String> words = utils::split(line);
vector<String>::size_type l = words.size();
- if (l != 3)
+ if (l < 3)
continue;
String name = words[0];
String::size_type idx = name.rfind('.');
^ permalink raw reply [flat|nested] 9+ messages in thread* [Cluster-devel] conga/ricci/modules/rpm PackageHandler.cpp
@ 2009-03-09 20:20 rmccabe
0 siblings, 0 replies; 9+ messages in thread
From: rmccabe @ 2009-03-09 20:20 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Branch: RHEL5
Changes by: rmccabe at sourceware.org 2009-03-09 20:20:58
Modified files:
ricci/modules/rpm: PackageHandler.cpp
Log message:
The kmod-gfs2 and kmod-gfs2-xen packages disappeared in 5.3
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/rpm/PackageHandler.cpp.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.9.2.12&r2=1.9.2.13
--- conga/ricci/modules/rpm/PackageHandler.cpp 2008/07/14 21:52:30 1.9.2.12
+++ conga/ricci/modules/rpm/PackageHandler.cpp 2009/03/09 20:20:58 1.9.2.13
@@ -510,12 +510,10 @@
set.packages.push_back("gfs-utils");
if (kernel.find("xen") == kernel.npos) {
set.packages.push_back("kmod-gfs");
- set.packages.push_back("kmod-gfs2");
set.packages.push_back("cmirror");
set.packages.push_back("kmod-cmirror");
} else {
set.packages.push_back("kmod-gfs-xen");
- set.packages.push_back("kmod-gfs2-xen");
set.packages.push_back("kmod-cmirror-xen");
}
}
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2009-03-09 20:20 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-09-26 0:56 [Cluster-devel] conga/ricci/modules/rpm PackageHandler.cpp kupcevic
-- strict thread matches above, loose matches on Subject: below --
2006-10-11 22:33 kupcevic
2007-02-05 11:10 kupcevic
2007-02-05 21:29 rmccabe
2007-02-05 22:19 kupcevic
2007-03-03 5:15 rmccabe
2007-03-03 5:16 rmccabe
2007-03-03 5:18 rmccabe
2009-03-09 20:20 rmccabe
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).