extras-repoclosure rc-modified,1.36,1.37

Michael Schwendt mschwendt at fedoraproject.org
Fri Sep 24 14:11:35 UTC 2010


Author: mschwendt

Update of /cvs/fedora/extras-repoclosure
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv13541

Modified Files:
	rc-modified 
Log Message:
Enhancement for libmunge in spam-o-matic (bugzilla #637172) to cover additional owners of SONAME bumps.


Index: rc-modified
===================================================================
RCS file: /cvs/fedora/extras-repoclosure/rc-modified,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- rc-modified	20 Sep 2010 19:48:17 -0000	1.36
+++ rc-modified	24 Sep 2010 14:11:34 -0000	1.37
@@ -291,13 +291,20 @@
         pass
 
 
-# taken from mash's spam-o-matic
-def libmunge(match):
+# originally taken from mash's spam-o-matic
+# but enhanced
+def libmunge_fwd(match):
     if match.groups()[1].isdigit():
         return "%s%d" % (match.groups()[0],int(match.groups()[1])+1)
     else:
         return "%s%s" % (match.groups()[0],match.groups()[1])
 
+def libmunge_bwd(match):
+    if match.groups()[1].isdigit():
+        return "%s%d" % (match.groups()[0],int(match.groups()[1])-1)
+    else:
+        return "%s%s" % (match.groups()[0],match.groups()[1])
+
 # taken from mash's spam-o-matic
 def getSrcPkg(pkg):
     if pkg.arch == 'src':
@@ -325,7 +332,9 @@
 
     # Libraries: check for variant in soname
     if re.match("lib.*\.so\.[0-9]+",dep):
-        new = re.sub("(lib.*\.so\.)([0-9])+",libmunge,dep)
+        new = re.sub("(lib.*\.so\.)([0-9]+)",libmunge_fwd,dep)
+        __addpackages(resolver.whatProvides(new, None, None))
+        new = re.sub("(lib.*\.so\.)([0-9]+)",libmunge_bwd,dep)
         __addpackages(resolver.whatProvides(new, None, None))
         libname = dep.split('.')[0]
         __addpackages(resolver.whatProvides(libname, None, None))



More information about the scm-commits mailing list