thomas: server rpmdircmp,1.3,1.4

cvs at kolab.org cvs at kolab.org
Wed May 21 18:30:18 CEST 2008


Author: thomas

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv13897

Modified Files:
	rpmdircmp 
Log Message:
rpmdircmp: allow extension to be specified with or without leading dot.


Index: rpmdircmp
===================================================================
RCS file: /kolabrepository/server/rpmdircmp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- rpmdircmp	13 Mar 2008 17:30:47 -0000	1.3
+++ rpmdircmp	21 May 2008 16:30:16 -0000	1.4
@@ -44,7 +44,7 @@
         sys.stderr.write("%d ...    \r" % todo)
         todo -= 1
         if rpm.endswith(ext):
-            entry = rpm[:-len(ext)-1].rsplit('-', 2)
+            entry = rpm[:-len(ext)].rsplit('-', 2)
             entry.append(rpmpackager(rpmdir, rpm))
             rpms.append(tuple(entry))
     sys.stderr.write('OK.        \n')
@@ -63,6 +63,8 @@
 def main(olddir, newdir, ext=None):
     if not ext:
         ext = '.src.rpm'
+    elif not ext.startswith('.'):
+        ext = ".%s" % ext
     oldrpms, oldnames, olddict = rpmsets(olddir, ext)
     newrpms, newnames, newdict = rpmsets(newdir, ext)
 





More information about the commits mailing list