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

Changed files:
    modules/common.py -> 1.3
    modules/config.py -> 1.3
    modules/ftptree.py -> 1.6

diff --git a/modules/common.py b/modules/common.py
index f47cd49a671b60e63ca511a432efbc902368d140..4956fcd9c838196bceb56b91b3e1309127c8b9b9 100644 (file)
--- a/modules/common.py
+++ b/modules/common.py
@@ -1,15 +1,24 @@
+# vi: encoding=utf-8 ts=8 sts=4 sw=4 et
+
 import os, sys, config
 
-def direxists(path):
+def fileexists(path):
+    if path[0]=='/':
+        fullpath=path
+    else:
+        fullpath=config.ftp_dir+path
+
     try:
-        os.stat(config.value['ftp_dir']+'/'+path)
+        os.stat(fullpath)
     except OSError, (errno, errmsg):
         return False
     else:
         return True
 
 def checkdir(dir):
-       if not direxists(sys.argv[1]):
-               print config.value['ftp_dir']+'/'+sys.argv[1] + " does not exist"
-               sys.exit(1)
+    if not fileexists(sys.argv[1]):
+        print config.value['ftp_dir']+'/'+sys.argv[1] + " does not exist"
+        sys.exit(1)
 
+pldftpadmdir=os.environ['HOME']+'/pld-ftp-admin/'
+noarchcachedir=pldftpadmdir+'var/noarch-cache/'

diff --git a/modules/config.py b/modules/config.py
index a145e3c8b96f8688dc737e3ec910b7c07f2dc2c6..68eaaa10048f83a864d10515f5893e9e780a8506 100644 (file)
--- a/modules/config.py
+++ b/modules/config.py
@@ -22,4 +22,8 @@ for line in f.readlines():
 
 f.close()
 
+ftp_dir=value['ftp_dir']+'/'
+incoming_dir=value['ftp_dir']+'/'+value['incoming_dir']+'/'
+default_to=value['ftp_dir']+'/'+value['default_to']+'/'
+ftp_archs=value['ftp_archs'].split(' ')
 

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):