pld-ftp-admin: modules/ftptree.py - allow skipping debugfiles in Pkg.rpmfiles

glen glen at pld-linux.org
Sun Jan 9 19:32:57 CET 2011


Author: glen                         Date: Sun Jan  9 18:32:57 2011 GMT
Module: pld-ftp-admin                 Tag: HEAD
---- Log message:
- allow skipping debugfiles in Pkg.rpmfiles

---- Files affected:
pld-ftp-admin/modules:
   ftptree.py (1.47 -> 1.48) 

---- Diffs:

================================================================
Index: pld-ftp-admin/modules/ftptree.py
diff -u pld-ftp-admin/modules/ftptree.py:1.47 pld-ftp-admin/modules/ftptree.py:1.48
--- pld-ftp-admin/modules/ftptree.py:1.47	Sun Jan  9 16:55:26 2011
+++ pld-ftp-admin/modules/ftptree.py	Sun Jan  9 19:32:51 2011
@@ -163,7 +163,7 @@
                         rm(noarchcachedir + rpm + '.reqlist', test)
         rm(self.tree.basedir + '/SRPMS/.metadata/' + self.nvr + '.src.rpm.info', test)
 
-    def rpmfiles(self):
+    def rpmfiles(self, debugfiles = True):
         """
         Return rpm files related to this package
         """
@@ -171,7 +171,8 @@
         for arch, rpms in self.files.items():
             for nvr in rpms:
                 if self.is_debuginfo(nvr):
-                    files.append(self.tree.basedir + '/' + arch + '/debuginfo/' + nvr)
+                    if debugfiles:
+                        files.append(self.tree.basedir + '/' + arch + '/debuginfo/' + nvr)
                 else:
                     files.append(self.tree.basedir + '/' + arch + '/RPMS/' + nvr)
         return files
@@ -218,7 +219,7 @@
                         msg = "TEST "
                     pinfo("%sArch %s for %s is already present in dest tree; removing from srctree" % (msg, arch, self.nvr))
                     for rpm in self.files[arch]:
-                        if self.is_debuginfo(rpm):
+                        if self.il-page-warningus_debuginfo(rpm):
                             rm(self.tree.basedir + '/' + arch + '/debuginfo/' + rpm, test)
                         else:
                             rm(self.tree.basedir + '/' + arch + '/RPMS/' + rpm, test)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-ftp-admin/modules/ftptree.py?r1=1.47&r2=1.48&f=u



More information about the pld-cvs-commit mailing list