summaryrefslogtreecommitdiffstats
path: root/src/lib/Client
diff options
context:
space:
mode:
authorNarayan Desai <desai@mcs.anl.gov>2009-01-13 13:19:04 +0000
committerNarayan Desai <desai@mcs.anl.gov>2009-01-13 13:19:04 +0000
commitc953c93084872820aa33dc3d38af1ddfe80f86ca (patch)
tree8ca5714b29786d9592e97ab7f004f2acb6706b51 /src/lib/Client
parent5fbbf82fd8d9d128b734f3d9d655de6c12b484d0 (diff)
downloadbcfg2-c953c93084872820aa33dc3d38af1ddfe80f86ca.tar.gz
bcfg2-c953c93084872820aa33dc3d38af1ddfe80f86ca.tar.bz2
bcfg2-c953c93084872820aa33dc3d38af1ddfe80f86ca.zip
Fall back to auto behavior for APT version=any installation (Resolves Ticket #631)
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5018 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/lib/Client')
-rw-r--r--src/lib/Client/Tools/APT.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/lib/Client/Tools/APT.py b/src/lib/Client/Tools/APT.py
index 338694258..6e345b9c7 100644
--- a/src/lib/Client/Tools/APT.py
+++ b/src/lib/Client/Tools/APT.py
@@ -143,7 +143,7 @@ class APT(Bcfg2.Client.Tools.Tool):
if not pkg.get('name') in self.pkg_cache:
self.logger.error("APT has no information about package %s" % (pkg.get('name')))
continue
- if pkg.get('version') == 'auto':
+ if pkg.get('version') in ['auto', 'any']:
ipkgs.append("%s=%s" % (pkg.get('name'),
self.pkg_cache[pkg.get('name')].candidateVersion))
continue
@@ -151,8 +151,6 @@ class APT(Bcfg2.Client.Tools.Tool):
[p.VerStr for p in self.pkg_cache[pkg.get('name')]._pkg.VersionList]:
ipkgs.append("%s=%s" % (pkg.get('name'), pkg.get('version')))
continue
- if pkg.get('version') == 'any':
- self.logger.error("Cannot choose appropriate version for pkg %s; version=any" % pkg.get('name'))
bad_pkgs.append(pkg.get('name'))
if bad_pkgs:
self.logger.error("Cannot find correct versions of packages:")