client/rhel/rhn-client-tools/src/bin/rhnreg_ks.py | 6 +++---
client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py | 10 ++++------
client/rhel/rhn-client-tools/src/up2date_client/tui.py | 6 +++---
3 files changed, 10 insertions(+), 12 deletions(-)
New commits:
commit 77c7e858bebe5812f8565ef1fe995f1ab4c473fc
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Mon Dec 7 13:47:10 2009 +0100
489901 - for registration, send all packages with arch field
getInstalledPackageList(getInfo=1) would return list of packages with
both arch and cookie field set. getInstalledPackageList(getArch=1) would
return list of packages with just arch field set.
It's safe to use getArch=1 for package list syncing during registration b/c:
1) we don't use the cookie information
2) rhn-profile-sync uses getArch=1 for package profile syncing
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..16de077 100755
--- a/client/rhel/rhn-client-tools/src/bin/rhnreg_ks.py
+++ b/client/rhel/rhn-client-tools/src/bin/rhnreg_ks.py
@@ -99,10 +99,10 @@ class RegisterKsCli(rhncli.RhnCli):
self.options.email)
if not self.options.nopackages:
- getInfo = 0
+ getArch = 0
if rhnreg.cfg['supportsExtendedPackageProfile']:
- getInfo = 1
- packageList = rpmUtils.getInstalledPackageList(getInfo=getInfo)
+ getArch = 1
+ packageList = rpmUtils.getInstalledPackageList(getArch=getArch)
else:
packageList = []
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py
b/client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py
index a9b6d8e..4ac8f66 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py
@@ -1093,14 +1093,12 @@ class CreateProfilePage:
pwin.setProgress(4, 6)
if self.sendPackages:
- # interesting...
- getInfo = 0
-# if self.cfg['supportsExtendedPackageProfile']
- #FIXME
- getInfo = 1
+ getArch = 0
+ if self.cfg['supportsExtendedPackageProfile']:
+ getArch = 1
packageList = rpmUtils.getInstalledPackageList(progressCallback = lambda
amount,
total:
gtk.main_iteration(False),
- getInfo=getInfo)
+ getArch=getArch)
## selection = []
# FIXME
selectedPackages = packageList
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/tui.py
b/client/rhel/rhn-client-tools/src/up2date_client/tui.py
index f03a6cd..c6bea78 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/tui.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/tui.py
@@ -989,10 +989,10 @@ class PackagesWindow:
self.pwin.add(self.scale, 0, 0)
self.pwin.draw()
self.screen.refresh()
- getInfo = 0
+ getArch = 0
if rhnreg.cfg['supportsExtendedPackageProfile']:
- getInfo = 1
- tui.packageList = rpmUtils.getInstalledPackageList(getInfo=getInfo)
+ getArch = 1
+ tui.packageList = rpmUtils.getInstalledPackageList(getArch=getArch)
self.screen.popWindow()
for package in tui.packageList: