diff options
| author | Narayan Desai <desai@mcs.anl.gov> | 2009-10-19 03:20:18 +0000 |
|---|---|---|
| committer | Narayan Desai <desai@mcs.anl.gov> | 2009-10-19 03:20:18 +0000 |
| commit | d8a5953ef8272400b0ef78d07b12f687c1f9a4bb (patch) | |
| tree | 937dd06a72c286bbca0426e06b9fd1f40050a42f | |
| parent | fb235e7932b50c4d87e67bde9e02018ef060df30 (diff) | |
| download | bcfg2-d8a5953ef8272400b0ef78d07b12f687c1f9a4bb.tar.gz bcfg2-d8a5953ef8272400b0ef78d07b12f687c1f9a4bb.tar.bz2 bcfg2-d8a5953ef8272400b0ef78d07b12f687c1f9a4bb.zip | |
Packages: Add virtual packages properly
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5487 ce84e21b-d406-0410-9b95-82705330c041
| -rw-r--r-- | src/lib/Server/Plugins/Packages.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/Server/Plugins/Packages.py b/src/lib/Server/Plugins/Packages.py index 7bc9d1e27..10ced5d15 100644 --- a/src/lib/Server/Plugins/Packages.py +++ b/src/lib/Server/Plugins/Packages.py @@ -150,7 +150,7 @@ class Source(object): item = work.pop() seen.add(item) if debug: - logger.debug("Handling pkg %s" % item) + logger.debug("Handling item %s" % item) item_is_pkg = self.is_package(metadata, item) try: pset = self.get_provides(metadata, item) @@ -180,7 +180,7 @@ class Source(object): if debug: logger.debug("Using package %s for requirement %s" \ % (provider, item)) - work.update(pset.difference(newpkg)) + newpkg.add(provider) # add deps for provider try: newdeps = set(self.get_deps(metadata, provider)) @@ -217,6 +217,7 @@ class Source(object): unknown.add(item) else: unknown.add(item) + logger.debug("===> Removing entries %s" % (work.intersection(seen))) work.difference_update(seen) return (newpkg, unknown) |