Ticket #428: rpmng-epoch.patch
File rpmng-epoch.patch, 1.5 KB (added by [email protected]…, 16 years ago) |
---|
-
RPMng.py
old new 850 854 ''' 851 855 Convert evra dict entries to a string. 852 856 ''' 853 return '%s:%s-%s.%s' % (instance.get('epoch', '*'), instance.get('version', '*'), 854 instance.get('release', '*'), instance.get('arch', '*')) 857 if instance.get('epoch', '*') == '*' or instance.get('epoch', '*') == None: 858 return '%s-%s.%s' % (instance.get('version', '*'), 859 instance.get('release', '*'), instance.get('arch', '*')) 860 else: 861 return '%s:%s-%s.%s' % (instance.get('epoch', '*'), instance.get('version', '*'), 862 instance.get('release', '*'), instance.get('arch', '*')) 855 863 856 864 def pkg_vr_equal(self, config_entry, installed_entry): 857 865 ''' … … 873 881 if config_entry.get('epoch', None) != None: 874 882 epoch = int(config_entry.get('epoch')) 875 883 else: 876 epoch = None884 epoch = 0 877 885 878 886 if (config_entry.tag == 'Instance' and\ 879 epoch == installed_entry.get('epoch', None) and \887 (epoch == installed_entry.get('epoch', 0) or (epoch == 0 and installed_entry.get('epoch', 0) == None)) and \ 880 888 config_entry.get('version') == installed_entry.get('version') and \ 881 889 config_entry.get('release') == installed_entry.get('release') and \ 882 890 config_entry.get('arch', None) == installed_entry.get('arch', None)):