summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNarayan Desai <desai@mcs.anl.gov>2007-07-07 02:25:25 +0000
committerNarayan Desai <desai@mcs.anl.gov>2007-07-07 02:25:25 +0000
commitce781647f7576c3cf4bf0f209f93a6e20d340e57 (patch)
tree08dce77ab483515248031b190b508a197c09cef4 /src
parentb5a0f5fb9b4dbe999395777a13b0f1dc85c75c3d (diff)
downloadbcfg2-ce781647f7576c3cf4bf0f209f93a6e20d340e57.tar.gz
bcfg2-ce781647f7576c3cf4bf0f209f93a6e20d340e57.tar.bz2
bcfg2-ce781647f7576c3cf4bf0f209f93a6e20d340e57.zip
fix epoch handing (from mbrady)
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@3423 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src')
-rw-r--r--src/lib/Client/Tools/RPMng.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/Client/Tools/RPMng.py b/src/lib/Client/Tools/RPMng.py
index c68b137fc..c89ade2b5 100644
--- a/src/lib/Client/Tools/RPMng.py
+++ b/src/lib/Client/Tools/RPMng.py
@@ -916,7 +916,8 @@ class RPMng(Bcfg2.Client.Tools.PkgTool):
if (config_entry.tag == 'Instance' and \
(epoch == installed_entry.get('epoch', 0) or \
- (epoch == 0 and installed_entry.get('epoch', 0) == None)) and \
+ (epoch == 0 and installed_entry.get('epoch', 0) == None) or \
+ (epoch == None and installed_entry.get('epoch', 0) == 0)) and \
config_entry.get('version') == installed_entry.get('version') and \
config_entry.get('release') == installed_entry.get('release') and \
config_entry.get('arch', None) == installed_entry.get('arch', None)):