- minor changes - mainly removing some additional files for noarch rpms

[projects/pld-ftp-admin.git] / modules / ftptree.py

diff --git a/modules/ftptree.py b/modules/ftptree.py
index c944d142a6747c065d9860225bda642035d7ef3f..27bd4b5f70634d29b0c77a5f752fee3a56c4b4e0 100644 (file)
--- a/modules/ftptree.py
+++ b/modules/ftptree.py
@@ -2,6 +2,7 @@
 # vi: encoding=utf-8 ts=8 sts=4 sw=4 et
 
 import sys, os, config, string, urllib, re
+from common import fileexists, noarchcachedir
 errnum=0
 
 def bailoutonerror():
@@ -94,6 +95,11 @@ class Pkg:
         for arch in self.file.keys():
             for rpm in self.file[arch]:
                 rm(self.tree.basedir+'/'+arch+'/RPMS/'+rpm)
+                if arch=='noarch':
+                    if fileexists(noarchcachedir+rpm+'.filelist'):
+                        rm(noarchcachedir+rpm+'.filelist')
+                    if fileexists(noarchcachedir+rpm+'.reqlist'):
+                        rm(noarchcachedir+rpm+'.reqlist')
         rm(self.tree.basedir+'/SRPMS/.metadata/'+self.name+'.src.rpm.info')
 
     def move(self, dsttree):