spacewalk-commits October 2009

spacewalk-commits@lists.fedorahosted.org

7 participants
136 discussions

backend/server client/rhel
by Miroslav Suchý 22 Oct '09

22 Oct '09

backend/server/action_extra_data/packages.py | 16 ++++++------ client/rhel/rhn-client-tools/src/up2date_client/rpmUtils.py | 13 ++++++--- 2 files changed, 18 insertions(+), 11 deletions(-) New commits: commit 9de19da46d7e2d35d7c437b4c8e71968ff881e0c Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Thu Oct 22 15:46:57 2009 +0200 449167 - partialy revert commit 836214ad373a67c227459dd07bc9660f70e94253, in verify we still use old format (array) diff --git a/backend/server/action_extra_data/packages.py b/backend/server/action_extra_data/packages.py index db3bfbb..7aca67c 100644 --- a/backend/server/action_extra_data/packages.py +++ b/backend/server/action_extra_data/packages.py @@ -124,9 +124,11 @@ def verify(server_id, action_id, data={}): uq_packages = {} for package_spec, responses in data['verify_info']: + package_spec = list(package_spec) # Fix the epoch - if package_spec['epoch'] == '': - package_spec['epoch'] = None + if package_spec[3] == '': + package_spec[3] = None + package_spec = tuple(package_spec) if uq_packages.has_key(package_spec): # Been here already continue @@ -148,11 +150,11 @@ def verify(server_id, action_id, data={}): dict['server_id'] = server_id dict['action_id'] = action_id - dict['package_name'] = package_spec['name'] - dict['version'] = package_spec['version'] - dict['release'] = package_spec['release'] - dict['epoch'] = package_spec['epoch'] - dict['arch'] = package_spec['arch'] + dict['package_name'] = package_spec[0] + dict['version'] = package_spec[1] + dict['release'] = package_spec[2] + dict['epoch'] = package_spec[3] + dict['arch'] = package_spec[4] if not dict.has_key('missing'): _hash_append(verify_attribs, dict) diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rpmUtils.py b/client/rhel/rhn-client-tools/src/up2date_client/rpmUtils.py index e88ad00..2af913c 100644 --- a/client/rhel/rhn-client-tools/src/up2date_client/rpmUtils.py +++ b/client/rhel/rhn-client-tools/src/up2date_client/rpmUtils.py @@ -53,10 +53,15 @@ def verifyPackages(packages): # Note: we cant reliable match on epoch, so just # skip it... two packages that only diff by epoch is # way broken anyway - keywords = {} - for key, value in package.iteritems(): - if key in ('name', 'version', 'release', 'arch') and (value != None) and (value != ""): - keywords[key] = value + keywords = {'name': package[0], + 'version': package[1], + 'release': package[2], + # we left our epoch + 'arch': package[4] + } + for key, value in keywords.iteritems(): + if (value == None) or (value == ""): + del(keywords[key]) headers = installedHeaderByKeyword(**keywords) if len(headers) == 0:

1 0

3 commits - backend/server schema/spacewalk
by Michael Mraka 22 Oct '09

22 Oct '09

backend/server/rhnServer/server_packages.py | 2 + schema/spacewalk/common/tables/rhnServerPackage.sql | 2 - schema/spacewalk/upgrade/spacewalk-schema-0.6-to-spacewalk-schema-0.7/004-1-rhnServerPackage_created.sql | 3 ++ schema/spacewalk/upgrade/spacewalk-schema-0.6-to-spacewalk-schema-0.7/004-2-rhnServerPackage_created-data.sql | 12 ++++++++++ schema/spacewalk/upgrade/spacewalk-schema-0.6-to-spacewalk-schema-0.7/004-3-rhnServerPackage_created-not-null.sql | 3 ++ schema/spacewalk/upgrade/spacewalk-schema-0.6-to-spacewalk-schema-0.7/004-rhnServerPackage_created.sql | 5 ---- schema/spacewalk/upgrade/spacewalk-schema-0.6-to-spacewalk-schema-0.7/005-rhnServerPackage_installed.sql | 2 - 7 files changed, 22 insertions(+), 7 deletions(-) New commits: commit 61572a013faec0071ed0f8cada7b47c2c5176cdb Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Thu Oct 22 14:55:08 2009 +0200 449167 - allow NULL values (old clients don't send installation time) diff --git a/schema/spacewalk/common/tables/rhnServerPackage.sql b/schema/spacewalk/common/tables/rhnServerPackage.sql index 808c27d..b55ddf2 100644 --- a/schema/spacewalk/common/tables/rhnServerPackage.sql +++ b/schema/spacewalk/common/tables/rhnServerPackage.sql @@ -27,7 +27,7 @@ CREATE TABLE rhnServerPackage REFERENCES rhnPackageArch (id), created DATE DEFAULT (sysdate) NOT NULL, - installtime DATE NOT NULL + installtime DATE ) TABLESPACE [[server_package_tablespace]] ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/upgrade/spacewalk-schema-0.6-to-spacewalk-schema-0.7/005-rhnServerPackage_installed.sql b/schema/spacewalk/upgrade/spacewalk-schema-0.6-to-spacewalk-schema-0.7/005-rhnServerPackage_installed.sql index 092ef8c..9a6493a 100644 --- a/schema/spacewalk/upgrade/spacewalk-schema-0.6-to-spacewalk-schema-0.7/005-rhnServerPackage_installed.sql +++ b/schema/spacewalk/upgrade/spacewalk-schema-0.6-to-spacewalk-schema-0.7/005-rhnServerPackage_installed.sql @@ -1,3 +1,3 @@ ALTER TABLE rhnServerPackage - ADD installtime DATE NOT NULL; + ADD installtime DATE; commit e9ed7c8a8b96c29e726b560cd70f4c96379d346c Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Thu Oct 22 14:53:42 2009 +0200 fixed upgrade scripts for rhnServerPackage.created diff --git a/schema/spacewalk/upgrade/spacewalk-schema-0.6-to-spacewalk-schema-0.7/004-1-rhnServerPackage_created.sql b/schema/spacewalk/upgrade/spacewalk-schema-0.6-to-spacewalk-schema-0.7/004-1-rhnServerPackage_created.sql new file mode 100644 index 0000000..5178813 --- /dev/null +++ b/schema/spacewalk/upgrade/spacewalk-schema-0.6-to-spacewalk-schema-0.7/004-1-rhnServerPackage_created.sql @@ -0,0 +1,3 @@ +ALTER TABLE rhnServerPackage + ADD created DATE; + diff --git a/schema/spacewalk/upgrade/spacewalk-schema-0.6-to-spacewalk-schema-0.7/004-2-rhnServerPackage_created-data.sql b/schema/spacewalk/upgrade/spacewalk-schema-0.6-to-spacewalk-schema-0.7/004-2-rhnServerPackage_created-data.sql new file mode 100644 index 0000000..55921f8 --- /dev/null +++ b/schema/spacewalk/upgrade/spacewalk-schema-0.6-to-spacewalk-schema-0.7/004-2-rhnServerPackage_created-data.sql @@ -0,0 +1,12 @@ +begin + loop + update rhnServerPackage + set created = sysdate + where created is null and rownum <= 1000000; + exit when sql%rowcount = 0; + commit; + end loop; + commit; +end; +/ + diff --git a/schema/spacewalk/upgrade/spacewalk-schema-0.6-to-spacewalk-schema-0.7/004-3-rhnServerPackage_created-not-null.sql b/schema/spacewalk/upgrade/spacewalk-schema-0.6-to-spacewalk-schema-0.7/004-3-rhnServerPackage_created-not-null.sql new file mode 100644 index 0000000..a1e2184 --- /dev/null +++ b/schema/spacewalk/upgrade/spacewalk-schema-0.6-to-spacewalk-schema-0.7/004-3-rhnServerPackage_created-not-null.sql @@ -0,0 +1,3 @@ +ALTER TABLE rhnServerPackage + MODIFY created DATE DEFAULT (sysdate) NOT NULL; + diff --git a/schema/spacewalk/upgrade/spacewalk-schema-0.6-to-spacewalk-schema-0.7/004-rhnServerPackage_created.sql b/schema/spacewalk/upgrade/spacewalk-schema-0.6-to-spacewalk-schema-0.7/004-rhnServerPackage_created.sql deleted file mode 100644 index 0f02f7a..0000000 --- a/schema/spacewalk/upgrade/spacewalk-schema-0.6-to-spacewalk-schema-0.7/004-rhnServerPackage_created.sql +++ /dev/null @@ -1,5 +0,0 @@ -ALTER TABLE rhnServerPackage - ADD created DATE DEFAULT (sysdate) NOT NULL; - -show errors - commit 341adeef22d16b354c75b96d0d7dc942ef6fec78 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Thu Oct 22 14:40:52 2009 +0200 449167 - old client don't send installtime but we have to have it defined diff --git a/backend/server/rhnServer/server_packages.py b/backend/server/rhnServer/server_packages.py index fb396c1..01afa33 100644 --- a/backend/server/rhnServer/server_packages.py +++ b/backend/server/rhnServer/server_packages.py @@ -48,6 +48,8 @@ class dbPackage: self.a = str(pdict['arch']) if pdict.has_key('installtime'): self.installtime = pdict['installtime'] + else: + self.installtime = None # nvrea is a tuple; we can use tuple as dictionary keys since they are # immutable self.nvrea = (self.n, self.v, self.r, self.e, self.a)

1 0

4 commits - backend/server schema/spacewalk
by Michael Mraka 22 Oct '09

22 Oct '09

backend/server/rhnServer/server_packages.py | 81 +++++----- backend/server/rhnServer/server_solarispatches.py | 11 - schema/spacewalk/common/tables/rhnServerPackage.sql | 3 schema/spacewalk/upgrade/spacewalk-schema-0.6-to-spacewalk-schema-0.7/005-rhnServerPackage_installed.sql | 3 4 files changed, 49 insertions(+), 49 deletions(-) New commits: commit 80cd4dd0ae45f573630098a1f2cbe60bf90ebf1f Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Thu Oct 22 14:23:00 2009 +0200 449167 - load/store installtime from/to db diff --git a/backend/server/rhnServer/server_packages.py b/backend/server/rhnServer/server_packages.py index 756e3f3..fb396c1 100644 --- a/backend/server/rhnServer/server_packages.py +++ b/backend/server/rhnServer/server_packages.py @@ -19,6 +19,7 @@ # import string +import time from types import DictType, TupleType from common import log_debug, rhn_rpm, rhnFault @@ -160,9 +161,9 @@ class Packages: log_debug(4, sysid, len(alist), "added packages") h = rhnSQL.prepare(""" insert into rhnServerPackage - (server_id, name_id, evr_id, package_arch_id) + (server_id, name_id, evr_id, package_arch_id, installtime) values (:sysid, LOOKUP_PACKAGE_NAME(:n), LOOKUP_EVR(:e, :v, :r), - LOOKUP_PACKAGE_ARCH(:a) + LOOKUP_PACKAGE_ARCH(:a), TO_DATE(:instime, 'YYYY-MM-DD HH24:MI:SS') ) """) package_data = { @@ -172,6 +173,8 @@ class Packages: 'r' : map(lambda a: a.r, alist), 'e' : map(lambda a: a.e, alist), 'a' : map(lambda a: a.a, alist), + 'instime' : map(lambda a: time.strftime('%Y-%m-%d %H:%M:%S', + time.localtime(a.installtime)), alist), } try: h.execute_bulk(package_data) @@ -224,13 +227,14 @@ class Packages: # Now load packages h = rhnSQL.prepare(""" select - rpn.name n, - rpe.version v, - rpe.release r, - rpe.epoch e, + rpn.name name, + rpe.version version, + rpe.release release, + rpe.epoch epoch, sp.name_id, sp.evr_id, - sp.package_arch_id + sp.package_arch_id, + TO_CHAR(sp.installtime, 'YYYY-MM-DD HH24:MI:SS') installtime from rhnServerPackage sp, rhnPackageName rpn, @@ -245,13 +249,12 @@ class Packages: t = h.fetchone_dict() if not t: break - if t["e"] is None: t["e"] = "" - package_arch_id = t["package_arch_id"] - package_arch = package_arches_hash[package_arch_id] - nvrea = (t['n'], t['v'], t['r'], t['e'], package_arch) - self.__p[nvrea] = dbPackage(nvrea, real=1, - name_id=t["name_id"], evr_id=t["evr_id"], - package_arch_id=package_arch_id) + t['arch'] = package_arches_hash[t['package_arch_id']] + t['installtime'] = time.mktime(time.strptime(t['installtime'], + "%Y-%m-%d %H:%M:%S")) + p = dbPackage(t, real=1, name_id=t['name_id'], evr_id=t['evr_id'], + package_arch_id=t['package_arch_id']) + self.__p[p.nvrea] = p log_debug(4, "Loaded %d packages for server %s" % (len(self.__p), sysid)) self.__loaded = 1 self.__changed = 0 commit 7296c432238d0f263e1ba31f56c077551109edad Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Thu Oct 22 13:57:22 2009 +0200 449167 - added installtime to package diff --git a/backend/server/rhnServer/server_packages.py b/backend/server/rhnServer/server_packages.py index 8381de0..756e3f3 100644 --- a/backend/server/rhnServer/server_packages.py +++ b/backend/server/rhnServer/server_packages.py @@ -45,6 +45,8 @@ class dbPackage: self.r = str(pdict['release']) self.e = str(pdict['epoch']) self.a = str(pdict['arch']) + if pdict.has_key('installtime'): + self.installtime = pdict['installtime'] # nvrea is a tuple; we can use tuple as dictionary keys since they are # immutable self.nvrea = (self.n, self.v, self.r, self.e, self.a) commit b4e97f215aafad324ab59991acd0dff48e36d5e4 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Thu Oct 22 13:55:24 2009 +0200 swallow get_nvrea into dbPackage diff --git a/backend/server/rhnServer/server_packages.py b/backend/server/rhnServer/server_packages.py index c45ca1f..8381de0 100644 --- a/backend/server/rhnServer/server_packages.py +++ b/backend/server/rhnServer/server_packages.py @@ -25,30 +25,26 @@ from common import log_debug, rhn_rpm, rhnFault from server import rhnSQL, rhnLib from server_lib import snapshot_server, check_entitlement -def get_nvrea(entry): - if type(entry) != DictType: - return None - if not entry.has_key('arch') or entry['arch'] is None: - entry['arch'] = "" - if string.lower(str(entry['epoch'])) == "(none)" or entry['epoch'] == None: - entry['epoch'] = "" - nvrea = [] - for k in ('name', 'version', 'release', 'epoch', 'arch'): - if entry[k] == None: - return None - else: - nvrea.append(str(entry[k])) - return tuple(nvrea) - # A small class that helps us represent things about a # database package. In this structure "real" means that we have an # entry in the database for it. class dbPackage: - def __init__(self, plist, real = 0, name_id=None, evr_id=None, + def __init__(self, pdict, real = 0, name_id=None, evr_id=None, package_arch_id=None): - if not isinstance(plist, TupleType): - plist = tuple(plist) - self.n, self.v, self.r, self.e, self.a = plist + if type(pdict) != DictType: + return None + if not pdict.has_key('arch') or pdict['arch'] is None: + pdict['arch'] = "" + if string.lower(str(pdict['epoch'])) == "(none)" or pdict['epoch'] == None: + pdict['epoch'] = "" + for k in ('name', 'version', 'release', 'epoch', 'arch'): + if pdict[k] == None: + return None + self.n = str(pdict['name']) + self.v = str(pdict['version']) + self.r = str(pdict['release']) + self.e = str(pdict['epoch']) + self.a = str(pdict['arch']) # nvrea is a tuple; we can use tuple as dictionary keys since they are # immutable self.nvrea = (self.n, self.v, self.r, self.e, self.a) @@ -81,32 +77,32 @@ class Packages: def add_package(self, sysid, entry): log_debug(4, sysid, entry) - p = get_nvrea(entry) + p = dbPackage(entry) if p is None: # Not a valid package spec return -1 if not self.__loaded: self.reload_packages_byid(sysid) - if self.__p.has_key(p): - self.__p[p].add() + if self.__p.has_key(p.nvrea): + self.__p[p.nvrea].add() self.__changed = 1 return 0 - self.__p[p] = dbPackage(p) + self.__p[p.nvrea] = p self.__changed = 1 return 0 # delete a package from the list def delete_package(self, sysid, entry): log_debug(4, sysid, entry) - p = get_nvrea(entry) + p = dbPackage(entry) if p is None: # Not a valid package spec return -1 if not self.__loaded: self.reload_packages_byid(sysid) - if self.__p.has_key(p): + if self.__p.has_key(p.nvrea): log_debug(4, " Package deleted") - self.__p[p].delete() + self.__p[p.nvrea].delete() self.__changed = 1 # deletion is always successfull return 0 diff --git a/backend/server/rhnServer/server_solarispatches.py b/backend/server/rhnServer/server_solarispatches.py index acee80a..90aa112 100644 --- a/backend/server/rhnServer/server_solarispatches.py +++ b/backend/server/rhnServer/server_solarispatches.py @@ -19,11 +19,7 @@ from common import log_debug from server import rhnSQL -from server_packages import get_nvrea - -# globals ---------------------------------------------------------------- - -NAME, VER, REL, EPOCH, ARCH = (0, 1, 2, 3, 4) +from server_packages import dbPackage # functions -------------------------------------------------------------- @@ -31,7 +27,7 @@ def get_package_id(pkg): """Lookup a package id from rhnPackage in the database, Return the id or return None if the package is not found""" - nvrea = get_nvrea(pkg) + p = dbPackage(entry) query = """SELECT id FROM rhnPackage WHERE name_id=LOOKUP_PACKAGE_NAME(:name) @@ -40,8 +36,7 @@ def get_package_id(pkg): handle = rhnSQL.prepare(query) - handle.execute(name=nvrea[NAME], epoch=nvrea[EPOCH], ver=nvrea[VER], - rel=nvrea[REL], arch=nvrea[ARCH]) + handle.execute(name=p.n, epoch=p.e, ver=p.v, rel=p.r, arch=p.a) row = handle.fetchone_dict() or {} commit d05e73fa00ae42460a2267cefd2a3f05990048dd Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Thu Oct 22 11:23:33 2009 +0200 449167 - added column for installation date/time diff --git a/schema/spacewalk/common/tables/rhnServerPackage.sql b/schema/spacewalk/common/tables/rhnServerPackage.sql index b500019..808c27d 100644 --- a/schema/spacewalk/common/tables/rhnServerPackage.sql +++ b/schema/spacewalk/common/tables/rhnServerPackage.sql @@ -26,7 +26,8 @@ CREATE TABLE rhnServerPackage package_arch_id NUMBER REFERENCES rhnPackageArch (id), created DATE - DEFAULT (sysdate) NOT NULL + DEFAULT (sysdate) NOT NULL, + installtime DATE NOT NULL ) TABLESPACE [[server_package_tablespace]] ENABLE ROW MOVEMENT diff --git a/schema/spacewalk/upgrade/spacewalk-schema-0.6-to-spacewalk-schema-0.7/005-rhnServerPackage_installed.sql b/schema/spacewalk/upgrade/spacewalk-schema-0.6-to-spacewalk-schema-0.7/005-rhnServerPackage_installed.sql new file mode 100644 index 0000000..092ef8c --- /dev/null +++ b/schema/spacewalk/upgrade/spacewalk-schema-0.6-to-spacewalk-schema-0.7/005-rhnServerPackage_installed.sql @@ -0,0 +1,3 @@ +ALTER TABLE rhnServerPackage + ADD installtime DATE NOT NULL; +

1 0

client/rhel
by Miroslav Suchý 22 Oct '09

22 Oct '09

client/rhel/rhn-client-tools/src/up2date_client/capabilities.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 80378167b306d6cc84cff00227ec59ac6d5e6a01 Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Thu Oct 22 11:51:37 2009 +0200 require only version 1, we can do workaround for server without version 2 diff --git a/client/rhel/rhn-client-tools/src/up2date_client/capabilities.py b/client/rhel/rhn-client-tools/src/up2date_client/capabilities.py index 9e00021..905b878 100644 --- a/client/rhel/rhn-client-tools/src/up2date_client/capabilities.py +++ b/client/rhel/rhn-client-tools/src/up2date_client/capabilities.py @@ -12,7 +12,7 @@ _ = gettext.gettext neededCaps = {"caneatCheese": {'version':"21"}, "supportsAutoUp2dateOption": {'version': "1"}, "registration.finish_message": {'version': "1"}, - "xmlrpc.packages.extended_profile": {'version':"2"}, + "xmlrpc.packages.extended_profile": {'version':"1"}, "registration.delta_packages": {'version':"1"}, "registration.remaining_subscriptions": {'version': '1'}, "registration.update_contact_info": {'version': "1"},

1 0

client/rhel
by Miroslav Suchý 22 Oct '09

22 Oct '09

client/rhel/rhn-client-tools/src/up2date_client/rpmUtils.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 0ac56996994d3d612304b1a3857c49894391aabb Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Thu Oct 22 11:28:59 2009 +0200 449167 - send to rhnServer time, when package has been actually installed diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rpmUtils.py b/client/rhel/rhn-client-tools/src/up2date_client/rpmUtils.py index 6752735..e88ad00 100644 --- a/client/rhel/rhn-client-tools/src/up2date_client/rpmUtils.py +++ b/client/rhel/rhn-client-tools/src/up2date_client/rpmUtils.py @@ -134,7 +134,8 @@ def getInstalledPackageList(msgCallback = None, progressCallback = None, 'name': h['name'], 'epoch': h['epoch'], 'version': h['version'], - 'release': h['release'] + 'release': h['release'], + 'installtime': h['installtime'] } if package['epoch'] == None: package['epoch'] = ""

1 0

backend/server client/rhel
by Miroslav Suchý 21 Oct '09

21 Oct '09

backend/server/rhnCapability.py | 2 client/rhel/rhn-client-tools/src/bin/rhnreg_ks.py | 2 client/rhel/rhn-client-tools/src/up2date_client/rhnPackageInfo.py | 25 +++++++++- client/rhel/rhn-client-tools/src/up2date_client/rhnreg.py | 4 + 4 files changed, 29 insertions(+), 4 deletions(-) New commits: commit 6006097b890aa925e06bf65a81d11d73f78b9103 Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Wed Oct 21 17:32:05 2009 +0200 check whether server has capability packages.extended_profile version 2. If not revert to old behaviour. diff --git a/backend/server/rhnCapability.py b/backend/server/rhnCapability.py index e511dc9..1cce272 100644 --- a/backend/server/rhnCapability.py +++ b/backend/server/rhnCapability.py @@ -185,7 +185,7 @@ def _set_server_capabilities(): 'xmlrpc.login.extra_data' : {'version' : 1, 'value' : 1}, 'rhncfg.content.base64_decode' : {'version' : 1, 'value' : 1}, 'rhncfg.filetype.directory' : {'version' : 1, 'value' : 1}, - 'xmlrpc.packages.extended_profile' : {'version' : 1, 'value' : 1}, + 'xmlrpc.packages.extended_profile' : {'version' : '1-2', 'value' : 1}, } l = [] for name, hashval in capabilities.items(): diff --git a/client/rhel/rhn-client-tools/src/bin/rhnreg_ks.py b/client/rhel/rhn-client-tools/src/bin/rhnreg_ks.py index e21f18e..f94ec88 100755 --- a/client/rhel/rhn-client-tools/src/bin/rhnreg_ks.py +++ b/client/rhel/rhn-client-tools/src/bin/rhnreg_ks.py @@ -104,7 +104,7 @@ class RegisterKsCli(rhncli.RhnCli): getInfo = 1 packageList = rpmUtils.getInstalledPackageList(getInfo=getInfo) else: - packageList = [] + packageList = {} hardwareList = hardware.Hardware() diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rhnPackageInfo.py b/client/rhel/rhn-client-tools/src/up2date_client/rhnPackageInfo.py index 7fc2ae5..0cb8e8d 100644 --- a/client/rhel/rhn-client-tools/src/up2date_client/rhnPackageInfo.py +++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnPackageInfo.py @@ -20,11 +20,15 @@ def remoteDeltaPackages(pkgs): s.registration.delta_packages(up2dateAuth.getSystemId(), pkgs) def updatePackageProfile(): + """ get a list of installed packages and send it to rhnServer """ log = up2dateLog.initLog() log.log_me("Updating package profile") + packages = rpmUtils.getInstalledPackageList(getArch=1) s = rhnserver.RhnServer() - s.registration.update_packages(up2dateAuth.getSystemId(), - rpmUtils.getInstalledPackageList(getArch=1)) + if not s.capabilities.hasCapability('xmlrpc.packages.extended_profile', 2): + # for older satellites and hosted - convert to old format + packages = convertPackagesFromHashToList(packages) + s.registration.update_packages(up2dateAuth.getSystemId(), packages) def pprint_pkglist(pkglist): if type(pkglist) == type([]): @@ -32,3 +36,20 @@ def pprint_pkglist(pkglist): else: output = "%s-%s-%s" % (pkglist[0], pkglist[1], pkglist[2]) return output + +def convertPackagesFromHashToList(packages): + """ takes list of hashes and covert it to list of lists + resulting strucure is: + [[name, version, release, epoch, arch, cookie], ... ] + """ + result = [] + for package in packages: + if package.has_key('arch') and package.has_key('cookie'): + result.append([package['name'], package['version'], package['release'], + package['epoch'], package['arch'], package['cookie']]) + elif package.has_key('arch'): + result.append([package['name'], package['version'], package['release'], + package['epoch'], package['arch']]) + else: + result.append([package['name'], package['version'], package['release'], package['epoch']]) + return result diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg.py b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg.py index 3df0629..34bf3c2 100644 --- a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg.py +++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg.py @@ -19,6 +19,7 @@ import rpcServer import urlparse import rhnreg_constants import hardware +from rhnPackageInfo import convertPackagesFromHashToList try: from rhn import rpclib @@ -636,6 +637,9 @@ def sendHardware(systemId, hardwareList): def sendPackages(systemId, packageList): s = rhnserver.RhnServer() + if not s.capabilities.hasCapability('xmlrpc.packages.extended_profile', 2): + # for older satellites and hosted - convert to old format + packageList = convertPackagesFromHashToList(packageList) s.registration.add_packages(systemId, packageList) def sendVirtInfo(systemId):

1 0

5 commits - backend/server
by Michael Mraka 21 Oct '09

21 Oct '09

backend/server/handlers/xmlrpc/registration.py | 63 +++++++++++++------------ 1 file changed, 34 insertions(+), 29 deletions(-) New commits: commit 9f2f87aba2b2aa01e71002f0aca06d78a59d45fc Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Wed Oct 21 16:03:05 2009 +0200 compare version as number diff --git a/backend/server/handlers/xmlrpc/registration.py b/backend/server/handlers/xmlrpc/registration.py index d1cbda9..4fdc5cd 100644 --- a/backend/server/handlers/xmlrpc/registration.py +++ b/backend/server/handlers/xmlrpc/registration.py @@ -987,7 +987,7 @@ class Registration(rhnHandler): packagesV2 = [] if client_caps and client_caps.has_key('packages.extended_profile'): cap_info = client_caps['packages.extended_profile'] - if cap_info and cap_info['version'] >= 2: + if cap_info and int(cap_info['version']) >= 2: package_is_dict = 1 packagesV2 = packages commit d626b3521ca423448e470b54d95b7f3f52d46e06 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Wed Oct 21 15:58:24 2009 +0200 arch and cookie are optional and packagesV2 have to be defined diff --git a/backend/server/handlers/xmlrpc/registration.py b/backend/server/handlers/xmlrpc/registration.py index b282a17..d1cbda9 100644 --- a/backend/server/handlers/xmlrpc/registration.py +++ b/backend/server/handlers/xmlrpc/registration.py @@ -984,6 +984,7 @@ class Registration(rhnHandler): # use a list of dicts client_caps = rhnCapability.get_client_capabilities() package_is_dict = 0 + packagesV2 = [] if client_caps and client_caps.has_key('packages.extended_profile'): cap_info = client_caps['packages.extended_profile'] if cap_info and cap_info['version'] >= 2: @@ -1008,9 +1009,11 @@ class Registration(rhnHandler): 'version': package[1], 'release': package[2], 'epoch' : package[3], - 'arch' : package[4], - 'cookie' : package[5], } + if len(package) > 4: + p['arch'] = package[4] + if len(package) > 5: + p['cookie'] = package[5] packagesV2.append(p) return packagesV2 commit 39f38cea43fc570b844678bb78cd26a367d0a547 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Wed Oct 21 15:48:34 2009 +0200 fixed capability we are looking for diff --git a/backend/server/handlers/xmlrpc/registration.py b/backend/server/handlers/xmlrpc/registration.py index c6d76b1..b282a17 100644 --- a/backend/server/handlers/xmlrpc/registration.py +++ b/backend/server/handlers/xmlrpc/registration.py @@ -985,7 +985,7 @@ class Registration(rhnHandler): client_caps = rhnCapability.get_client_capabilities() package_is_dict = 0 if client_caps and client_caps.has_key('packages.extended_profile'): - cap_info = client_caps['packages.update'] + cap_info = client_caps['packages.extended_profile'] if cap_info and cap_info['version'] >= 2: package_is_dict = 1 packagesV2 = packages commit 50d912a758d2130f978b6a1498356accfd36418a Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Wed Oct 21 15:21:30 2009 +0200 system_id is needed in _normalize_packages diff --git a/backend/server/handlers/xmlrpc/registration.py b/backend/server/handlers/xmlrpc/registration.py index 303e03b..c6d76b1 100644 --- a/backend/server/handlers/xmlrpc/registration.py +++ b/backend/server/handlers/xmlrpc/registration.py @@ -873,7 +873,7 @@ class Registration(rhnHandler): log_debug(5, system_id, packages) if CFG.DISABLE_PACKAGES: return 0 - packages = self._normalize_packages(packages) + packages = self._normalize_packages(system_id, packages) server = self.auth_system(system_id) # log the entry log_debug(1, server.getid(), "packages: %d" % len(packages)) @@ -888,7 +888,7 @@ class Registration(rhnHandler): log_debug(5, system_id, packages) if CFG.DISABLE_PACKAGES: return 0 - packages = self._normalize_packages(packages) + packages = self._normalize_packages(system_id, packages) server = self.auth_system(system_id) # log the entry log_debug(1, server.getid(), "packages: %d" % len(packages)) @@ -905,8 +905,8 @@ class Registration(rhnHandler): if type(packages) != type({}): log_error("Invalid argument type", type(packages)) raise rhnFault(21) - added_packages = self._normalize_packages(packages.get('added'), allow_none=1) - removed_packages = self._normalize_packages(ackages.get('deleted'), allow_none=1) + added_packages = self._normalize_packages(system_id, packages.get('added'), allow_none=1) + removed_packages = self._normalize_packages(system_id, packages.get('deleted'), allow_none=1) server = self.auth_system(system_id) # log the entry @@ -949,7 +949,7 @@ class Registration(rhnHandler): log_debug(5, system_id, packages) if CFG.DISABLE_PACKAGES: return 0 - packages = self._normalize_packages(packages) + packages = self._normalize_packages(system_id, packages) server = self.auth_system(system_id) # log the entry @@ -960,7 +960,7 @@ class Registration(rhnHandler): server.save_packages() return 0 - def _normalize_packages(self, packages, allow_none=0): + def _normalize_packages(self, system_id, packages, allow_none=0): """ the function checks if list of packages is well formated and also converts packages from old list of lists (extended_profile >= 2) to new list of dicts (extended_profile = 2) commit a0040e2b79430b614f029b52b034be122e1f11d9 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Wed Oct 21 15:13:04 2009 +0200 put packages structure check into _normalize_packages() diff --git a/backend/server/handlers/xmlrpc/registration.py b/backend/server/handlers/xmlrpc/registration.py index fee2d33..303e03b 100644 --- a/backend/server/handlers/xmlrpc/registration.py +++ b/backend/server/handlers/xmlrpc/registration.py @@ -873,11 +873,10 @@ class Registration(rhnHandler): log_debug(5, system_id, packages) if CFG.DISABLE_PACKAGES: return 0 + packages = self._normalize_packages(packages) server = self.auth_system(system_id) # log the entry log_debug(1, server.getid(), "packages: %d" % len(packages)) - # Update the capabilities list - rhnCapability.update_client_capabilities(self.server_id) for package in packages: server.add_package(package) # XXX: check return code @@ -889,14 +888,10 @@ class Registration(rhnHandler): log_debug(5, system_id, packages) if CFG.DISABLE_PACKAGES: return 0 - if type(packages) != type([]): - log_error("Invalid argument type", type(packages)) - raise rhnFault(21) + packages = self._normalize_packages(packages) server = self.auth_system(system_id) # log the entry log_debug(1, server.getid(), "packages: %d" % len(packages)) - # Update the capabilities list - rhnCapability.update_client_capabilities(self.server_id) for package in packages: server.delete_package(package) # XXX: check return code @@ -910,15 +905,9 @@ class Registration(rhnHandler): if type(packages) != type({}): log_error("Invalid argument type", type(packages)) raise rhnFault(21) - added_packages = packages.get('added') - removed_packages = packages.get('deleted') - if type(added_packages) not in (types.NoneType, types.ListType): - log_error("Invalid argument type", type(added_packages)) - raise rhnFault(21) - if type(removed_packages) not in (types.NoneType, types.ListType): - log_error("Invalid argument type", type(removed_packages)) - raise rhnFault(21) - + added_packages = self._normalize_packages(packages.get('added'), allow_none=1) + removed_packages = self._normalize_packages(ackages.get('deleted'), allow_none=1) + server = self.auth_system(system_id) # log the entry if added_packages is not None: @@ -960,6 +949,25 @@ class Registration(rhnHandler): log_debug(5, system_id, packages) if CFG.DISABLE_PACKAGES: return 0 + packages = self._normalize_packages(packages) + + server = self.auth_system(system_id) + # log the entry + log_debug(1, server.getid(), "packages: %d" % len(packages)) + server.dispose_packages() + for package in packages: + server.add_package(package) + server.save_packages() + return 0 + + def _normalize_packages(self, packages, allow_none=0): + """ the function checks if list of packages is well formated + and also converts packages from old list of lists + (extended_profile >= 2) to new list of dicts (extended_profile = 2) + """ + + if allow_none and packages is None: + return None # we need to be paranoid about the format of the argument because # if we accept wrong input then we might end up disposing in error # of all packages registered here @@ -968,7 +976,9 @@ class Registration(rhnHandler): raise rhnFault(21) # Update the capabilities list + server = self.auth_system(system_id) rhnCapability.update_client_capabilities(self.server_id) + # old clients send packages as a list of arrays # while new (capability packages.extended_profile >= {version: 2, value: 1}) # use a list of dicts @@ -1002,15 +1012,7 @@ class Registration(rhnHandler): 'cookie' : package[5], } packagesV2.append(p) - - server = self.auth_system(system_id) - # log the entry - log_debug(1, server.getid(), "packages: %d" % len(packages)) - server.dispose_packages() - for package in packagesV2: - server.add_package(package) - server.save_packages() - return 0 + return packagesV2 # Insert a new profile for the server def add_hw_profile(self, system_id, hwlist):

1 0

2 commits - backend/server
by Michael Mraka 21 Oct '09

21 Oct '09

backend/server/rhnServer/server_packages.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit a1d9191a4589fc42dc435cd318397daa799022d4 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Wed Oct 21 14:08:15 2009 +0200 fix for nonexistent arch (e.g. for gpgkeys) diff --git a/backend/server/rhnServer/server_packages.py b/backend/server/rhnServer/server_packages.py index 9591689..c45ca1f 100644 --- a/backend/server/rhnServer/server_packages.py +++ b/backend/server/rhnServer/server_packages.py @@ -28,7 +28,7 @@ from server_lib import snapshot_server, check_entitlement def get_nvrea(entry): if type(entry) != DictType: return None - if entry['arch'] is None: + if not entry.has_key('arch') or entry['arch'] is None: entry['arch'] = "" if string.lower(str(entry['epoch'])) == "(none)" or entry['epoch'] == None: entry['epoch'] = "" commit 0de5d7810deb1e6eab1948726fcb57c36bebdecd Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Wed Oct 21 14:04:31 2009 +0200 fixed variable types diff --git a/backend/server/rhnServer/server_packages.py b/backend/server/rhnServer/server_packages.py index 44bf704..9591689 100644 --- a/backend/server/rhnServer/server_packages.py +++ b/backend/server/rhnServer/server_packages.py @@ -30,7 +30,7 @@ def get_nvrea(entry): return None if entry['arch'] is None: entry['arch'] = "" - if string.lower(entry['epoch']) == "(none)" or entry['epoch'] == None: + if string.lower(str(entry['epoch'])) == "(none)" or entry['epoch'] == None: entry['epoch'] = "" nvrea = [] for k in ('name', 'version', 'release', 'epoch', 'arch'): @@ -38,7 +38,7 @@ def get_nvrea(entry): return None else: nvrea.append(str(entry[k])) - return nvrea + return tuple(nvrea) # A small class that helps us represent things about a # database package. In this structure "real" means that we have an

1 0

backend/server client/rhel
by Miroslav Suchý 21 Oct '09

21 Oct '09

backend/server/rhnServer/server_packages.py | 4 ++-- backend/server/rhnServer/server_wrapper.py | 2 +- client/rhel/rhn-client-tools/src/up2date_client/rpmUtils.py | 6 ++++-- 3 files changed, 7 insertions(+), 5 deletions(-) New commits: commit 9f45c24a07b54b47ff566172848595d9ee437bdc Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Wed Oct 21 13:43:52 2009 +0200 fixing logical typos diff --git a/backend/server/rhnServer/server_packages.py b/backend/server/rhnServer/server_packages.py index 9dcffbb..44bf704 100644 --- a/backend/server/rhnServer/server_packages.py +++ b/backend/server/rhnServer/server_packages.py @@ -19,14 +19,14 @@ # import string -from types import ListType, TupleType +from types import DictType, TupleType from common import log_debug, rhn_rpm, rhnFault from server import rhnSQL, rhnLib from server_lib import snapshot_server, check_entitlement def get_nvrea(entry): - if type(entry) not in (DictType): + if type(entry) != DictType: return None if entry['arch'] is None: entry['arch'] = "" diff --git a/backend/server/rhnServer/server_wrapper.py b/backend/server/rhnServer/server_wrapper.py index aaba1b2..950e169 100644 --- a/backend/server/rhnServer/server_wrapper.py +++ b/backend/server/rhnServer/server_wrapper.py @@ -56,7 +56,7 @@ class ServerWrapper(Packages, Hardware, History, SolarisPatches): # Wrappers for the similar functions from Packages class that supplementaly # require a valid sysid. def add_package(self, entry): - if entry[0].startswith("patch-solaris"): + if entry['name'].startswith("patch-solaris"): SolarisPatches.add_patch(self, self.server.get("id"), entry) return Packages.add_package(self, self.server.get("id"), entry) diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rpmUtils.py b/client/rhel/rhn-client-tools/src/up2date_client/rpmUtils.py index 5419bdc..6752735 100644 --- a/client/rhel/rhn-client-tools/src/up2date_client/rpmUtils.py +++ b/client/rhel/rhn-client-tools/src/up2date_client/rpmUtils.py @@ -144,8 +144,10 @@ def getInstalledPackageList(msgCallback = None, progressCallback = None, if package['arch']: pkg_list.append(package) elif getInfo: - package['arch'] = h['arch'] - package['cookie'] = h['cookie'] + if h['arch']: + package['arch'] = h['arch'] + if h['cookie']: + package['cookie'] = h['cookie'] pkg_list.append(package) else: pkg_list.append(package)

1 0

backend/server client/rhel
by Miroslav Suchý 21 Oct '09

21 Oct '09

backend/server/handlers/xmlrpc/registration.py | 6 +++--- backend/server/rhnServer/server_packages.py | 4 ++-- client/rhel/rhn-client-tools/src/up2date_client/capabilities.py | 2 +- client/rhel/rhn-client-tools/src/up2date_client/clientCaps.py | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) New commits: commit 369f8294756c4d3bdc30987fdd78852554527560 Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Wed Oct 21 11:21:42 2009 +0200 fixing typos this python, not perl diff --git a/backend/server/handlers/xmlrpc/registration.py b/backend/server/handlers/xmlrpc/registration.py index 11d2141..fee2d33 100644 --- a/backend/server/handlers/xmlrpc/registration.py +++ b/backend/server/handlers/xmlrpc/registration.py @@ -983,17 +983,17 @@ class Registration(rhnHandler): for package in packages: if package_is_dict: # extended_profile >= 2 - if type(package) != type({})): + if type(package) != type({}): log_error("Invalid package spec for extended_profile >= 2", type(package), "len = %d" % len(package)) raise rhnFault(21) - else + else: # extended_profile < 2 if (type(package) != type([]) or len(package) < 4): log_error("Invalid package spec", type(package), "len = %d" % len(package)) raise rhnFault(21) - else + else: p = {'name' : package[0], 'version': package[1], 'release': package[2], diff --git a/backend/server/rhnServer/server_packages.py b/backend/server/rhnServer/server_packages.py index cb4f65a..9dcffbb 100644 --- a/backend/server/rhnServer/server_packages.py +++ b/backend/server/rhnServer/server_packages.py @@ -34,9 +34,9 @@ def get_nvrea(entry): entry['epoch'] = "" nvrea = [] for k in ('name', 'version', 'release', 'epoch', 'arch'): - if entry[k] = None: + if entry[k] == None: return None - else + else: nvrea.append(str(entry[k])) return nvrea diff --git a/client/rhel/rhn-client-tools/src/up2date_client/capabilities.py b/client/rhel/rhn-client-tools/src/up2date_client/capabilities.py index 905b878..9e00021 100644 --- a/client/rhel/rhn-client-tools/src/up2date_client/capabilities.py +++ b/client/rhel/rhn-client-tools/src/up2date_client/capabilities.py @@ -12,7 +12,7 @@ _ = gettext.gettext neededCaps = {"caneatCheese": {'version':"21"}, "supportsAutoUp2dateOption": {'version': "1"}, "registration.finish_message": {'version': "1"}, - "xmlrpc.packages.extended_profile": {'version':"1"}, + "xmlrpc.packages.extended_profile": {'version':"2"}, "registration.delta_packages": {'version':"1"}, "registration.remaining_subscriptions": {'version': '1'}, "registration.update_contact_info": {'version': "1"}, diff --git a/client/rhel/rhn-client-tools/src/up2date_client/clientCaps.py b/client/rhel/rhn-client-tools/src/up2date_client/clientCaps.py index daccded..a4749a6 100644 --- a/client/rhel/rhn-client-tools/src/up2date_client/clientCaps.py +++ b/client/rhel/rhn-client-tools/src/up2date_client/clientCaps.py @@ -73,6 +73,6 @@ registerCap("packages.runTransaction", {'version':'1', 'value':'1'}) registerCap("packages.rollBack", {'version':'1', 'value':'1'}) registerCap("packages.verify", {'version':'1', 'value':'1'}) registerCap("packages.verifyAll", {'version':'1', 'value':'1'}) -registerCap("packages.extended_profile", {'version':'1', 'value':'1'}) +registerCap("packages.extended_profile", {'version':'2', 'value':'1'}) registerCap("reboot.reboot", {'version':'1', 'value':'1'}) registerCap("packages.update", {'version':'2', 'value':'2'})

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
14
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

spacewalk-commits October 2009