Ticket #428: rpmng-epoch.patch

RPMng.py

@@ -850 +854 @@
         '''
             Convert evra dict entries to a string.
         '''
-        return '%s:%s-%s.%s' % (instance.get('epoch', '*'), instance.get('version', '*'),
-                                instance.get('release', '*'), instance.get('arch', '*'))
+        if instance.get('epoch', '*') == '*' or instance.get('epoch', '*') == None:
+            return '%s-%s.%s' % (instance.get('version', '*'),
+                                 instance.get('release', '*'), instance.get('arch', '*'))
+        else:
+            return '%s:%s-%s.%s' % (instance.get('epoch', '*'), instance.get('version', '*'),
+                                    instance.get('release', '*'), instance.get('arch', '*'))
 
     def pkg_vr_equal(self, config_entry, installed_entry):
         '''
@@ -873 +881 @@
         if config_entry.get('epoch', None) != None:
             epoch = int(config_entry.get('epoch'))
         else:
-            epoch = None
+            epoch = 0
 
         if (config_entry.tag == 'Instance' and\
-            epoch == installed_entry.get('epoch', None) and \
+            (epoch == installed_entry.get('epoch', 0) or (epoch == 0 and installed_entry.get('epoch', 0) == None)) 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)):