summaryrefslogtreecommitdiffstats
path: root/src/lib
diff options
context:
space:
mode:
authorNarayan Desai <desai@mcs.anl.gov>2009-10-21 02:55:12 +0000
committerNarayan Desai <desai@mcs.anl.gov>2009-10-21 02:55:12 +0000
commit9bf76f4b581c37b03bac49636447325146531dc9 (patch)
treeacee9ffdf5152b9c88ca5a9b3c7c58be30efa826 /src/lib
parent2fc74f0347ea4cde17b84e22a698d2f502cc65d8 (diff)
downloadbcfg2-9bf76f4b581c37b03bac49636447325146531dc9.tar.gz
bcfg2-9bf76f4b581c37b03bac49636447325146531dc9.tar.bz2
bcfg2-9bf76f4b581c37b03bac49636447325146531dc9.zip
bcfg2-info: simplify codepaths for debug mode
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5489 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/Client/Tools/YUMng.py7
-rw-r--r--src/lib/Server/Plugins/Packages.py4
2 files changed, 7 insertions, 4 deletions
diff --git a/src/lib/Client/Tools/YUMng.py b/src/lib/Client/Tools/YUMng.py
index 4c295de62..35852dd7f 100644
--- a/src/lib/Client/Tools/YUMng.py
+++ b/src/lib/Client/Tools/YUMng.py
@@ -78,10 +78,9 @@ class YUMng(Bcfg2.Client.Tools.RPMng.RPMng):
self.yb = yum.YumBase()
if hasattr(self.yb, 'doGenericSetup'):
self.yb.doGenericSetup()
- else:
- self.yb.doConfigSetup()
- self.yb.doTsSetup()
- self.yb.doRpmDBSetup()
+ self.yb.doConfigSetup()
+ self.yb.doTsSetup()
+ self.yb.doRpmDBSetup()
yup = self.yb.doPackageLists(pkgnarrow='updates')
if hasattr(self.yb.rpmdb, 'pkglist'):
yinst = self.yb.rpmdb.pkglist
diff --git a/src/lib/Server/Plugins/Packages.py b/src/lib/Server/Plugins/Packages.py
index 47d97957e..02596c5a8 100644
--- a/src/lib/Server/Plugins/Packages.py
+++ b/src/lib/Server/Plugins/Packages.py
@@ -158,6 +158,10 @@ class Source(object):
except NoData:
item_is_virt = False
+ #print "%s:%s:%s" % (item, item_is_pkg, item_is_virt)
+ if (not item_is_pkg) and (not item_is_virt):
+ unknown.add(item)
+ continue
if item_is_pkg and not item_is_virt:
newpkg.add(item)
try: