]> git.pld-linux.org Git - projects/pld-ftp-admin.git/blobdiff - modules/ftptree.py
- minor changes - mainly removing some additional files for noarch rpms
[projects/pld-ftp-admin.git] / modules / ftptree.py
index fce9268cfc7ca4d71a039c3bcdd02a26868fbe52..27bd4b5f70634d29b0c77a5f752fee3a56c4b4e0 100644 (file)
@@ -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():
@@ -9,16 +10,21 @@ def bailoutonerror():
         print "%d error(s) encountered... aborting" % errnum
         sys.exit(1)
 
+def pinfo(msg):
+    print msg
+
 def perror(msg):
     global errnum
     errnum=errnum+1
     print msg
 
 def rm(file):
+    #os.remove()
     print 'rm: '+file
 
 def mv(src, dst):
-    print "mv: %s %s" % (src, dst)
+    #os.rename()
+    print "mv: %s %s" % (src, dst+'/'+src.split('/')[-1])
 
 class Build:
     def __init__(self):
@@ -33,15 +39,22 @@ class Pkg:
         self.tree=tree
         self.name=name
         self.loaded=False
-        self.marked=False
+        self.marked4removal=False
+        self.marked4moving=False
         self.load()
 
     def __repr__(self):
         return self.name
 
-    def mark(self):
-        if not self.marked:
-            self.tree.markedpkgs.append(self)
+    def mark4moving(self):
+        if not self.marked4moving:
+            self.tree.marked4moving.append(self)
+            self.marked4moving=True
+
+    def mark4removal(self):
+        if not self.marked4removal:
+            self.tree.marked4removal.append(self)
+            self.marked4removal=True
 
     def load(self):
         f=open(self.tree.basedir+'/SRPMS/.metadata/'+self.name+'.src.rpm.info', 'r')
@@ -66,10 +79,10 @@ class Pkg:
         f.close()
         self.loaded=True
         if self.info.has_key('move'):
-            self.mark()
+            self.mark4moving()
 
     def writeinfo(self):
-        f=open(self.tree.basedir+'/SRPMS/.metadata/'+name+'.src.rpm.info', 'w')
+        f=open(self.tree.basedir+'/SRPMS/.metadata/'+self.name+'.src.rpm.info', 'w')
         for bid in self.build.keys():
             f.write("info:build:%s:requester:%s\ninfo:build:%s:requester_email:%s\n" % (bid, self.build[bid].requester, bid, self.build[bid].requester_email))
         for key in self.info.keys():
@@ -82,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):
@@ -89,6 +107,7 @@ class Pkg:
             movedany=False
             for arch in self.file.keys():
                 if arch in dsttree[self.name].file.keys():
+                    pinfo("Arch %s for %s is already present in dest tree; removing from srctree" % (arch, self.name))
                     for rpm in self.file[arch]:
                         rm(self.tree.basedir+'/'+arch+'/RPMS/'+rpm)
                 else:
@@ -100,7 +119,7 @@ class Pkg:
                 for bid in self.build.keys():
                     dsttree[self.name].build[bid]=self.build[bid]
                 dsttree[self.name].writeinfo()
-                rm(self.tree.basedir+'/SRPMS/.metadata/'+self.name+'.src.rpm.info')
+            rm(self.tree.basedir+'/SRPMS/.metadata/'+self.name+'.src.rpm.info')
         else:
             for arch in self.file.keys():
                 for rpm in self.file[arch]:
@@ -112,16 +131,14 @@ class FtpTree:
     def __init__(self, tree, loadall=False):
         self.basedir=config.value['ftp_dir']+'/'+tree
         self.loadedpkgs={}
-        self.markedpkgs=[]
-        def filter_pkgs(pkg):
-            if not pkg[-13:]=='.src.rpm.info':
-                return None
-            else:
-                return pkg[:-13]
-        self.pkgnames=map(filter_pkgs, os.listdir(self.basedir+'/SRPMS/.metadata/'))
+        self.marked4removal=[]
+        self.marked4moving=[]
+        self.pkgnames=[]
+        self.__loadpkgnames()
         if loadall:
-            for i in self.pkgnames:
-                self.loadedpkgs[i]=Pkg(i, self)
+            for pkgname in self.pkgnames:
+                self.loadedpkgs[pkgname]=Pkg(pkgname, self)
+
     def __getitem__(self, key):
         if self.loadedpkgs.has_key(key):
             return self.loadedpkgs[key]
@@ -139,6 +156,10 @@ class FtpTree:
     def keys(self):
         return self.pkgnames
 
+    def testmove(self, dsttree):
+        self.__checkbuild()
+        self.__checkarchs(dsttree)
+
     def movepkgs(self, dsttree):
         self.__checkbuild()
         bailoutonerror()
@@ -147,10 +168,32 @@ class FtpTree:
         self.__rmolderfromsrc()
         self.__rmotherfromdst(dsttree)
 
-        for pkg in self.markedpkgs:
+        for pkg in self.marked4moving:
             pkg.move(dsttree)
 
-    def markpkgs(self, wannabepkgs):
+    def removepkgs(self):
+        for pkg in self.marked4removal:
+            pkg.remove()
+
+    def mark4removal(self, wannabepkgs):
+        self.__mark4something(wannabepkgs, Pkg.mark4removal)
+
+    def mark4moving(self, wannabepkgs):
+        self.__mark4something(wannabepkgs, Pkg.mark4moving)
+        
+
+    # Internal functions below
+
+    def __loadpkgnames(self):
+        def checkfiletype(name):
+            if name[-13:]=='.src.rpm.info':
+                return True
+            else:
+                return False
+        list=filter(checkfiletype, os.listdir(self.basedir+'/SRPMS/.metadata'))
+        self.pkgnames=map((lambda x: x[:-13]), list)
+
+    def __mark4something(self, wannabepkgs, markfunction):
         def chopoffextension(pkg):
             found=pkg.find('.src.rpm')
             if found==-1:
@@ -162,10 +205,11 @@ class FtpTree:
             if pkgname in self.pkgnames:
                 if not pkgname in self.loadedpkgs.keys():
                     self.loadedpkgs[pkgname]=Pkg(pkgname, self)
-                self.loadedpkgs[pkgname].mark()
+                markfunction(self.loadedpkgs[pkgname])
             else:
                 perror(pkgname+" was not found in source tree")
         bailoutonerror()
+
     def __checkbuild(self):
         #f=urllib.urlopen('http://ep09.pld-linux.org/~builderth/queue.txt')
         f=open('queue.txt')
@@ -179,23 +223,14 @@ class FtpTree:
             elif i[0]=='b':
                 requests[id]=requests[id]+i
         f.close()
-        for pkg in self.markedpkgs:
+        for pkg in self.marked4moving:
             for bid in pkg.build.keys():
                 if requests.has_key(bid) and not requests[bid].find('?') == -1:
                     perror("Building of package %s (buildid %s) not finished" % (pkg,bid))
 
     def __checkarchs(self, dsttree):
-        def find_other_pkgs(pkg, tree):
-            ziewre=re.compile(string.join(pkg.name.split('-')[:-2], '-')+'-[^-]*-[^-]*$')
-            def filter_other_pkgs(x):
-                if ziewre.match(x) and not x == pkg.name:
-                    return x
-                else:
-                    return None
-            return filter(filter_other_pkgs, tree.pkgnames)
-        self.find_other_pkgs=find_other_pkgs
-        for pkg in self.markedpkgs:
-            otherpkgnames=find_other_pkgs(pkg, dsttree)
+        for pkg in self.marked4moving:
+            otherpkgnames=self.__find_other_pkgs(pkg, dsttree)
             curarchs=[]
             missingarchs=[]
             for somepkg in otherpkgnames:
@@ -204,33 +239,44 @@ class FtpTree:
                 if arch not in pkg.file.keys():
                     missingarchs.append(arch)
             if missingarchs:
-                perror('Moving pkg %s would remove archs: %s' % (pkg, missingarchs))
+                perror('Moving %s would remove archs: %s' % (pkg, missingarchs))
 
     def __rmolderfromsrc(self):
-        def find_older_pkgs(pkg):
-            def filter_older_pkgs(x):
-                ziew=x.split('-')
-                cur=pkg.name.split('-')
-                if ziew[-2]<cur[-2]:
-                    return x
-                elif ziew[-2]==cur[-2]:
-                    if ziew[-1]<cur[-1]:
-                        return x
-                    else:
-                        return None
-                else:
-                    return None
-            return filter(filter_older_pkgs, self.find_other_pkgs(pkg, self))
-
-        for pkg in self.markedpkgs:
-            olderpkgnames=find_older_pkgs(pkg)
+        for pkg in self.marked4moving:
+            olderpkgnames=self.__find_older_pkgs(pkg)
             for i in olderpkgnames:
                 Pkg(i, self).remove()
 
     def __rmotherfromdst(self, dsttree):
-        for pkg in self.markedpkgs:
-            pkgnames=self.find_other_pkgs(pkg, dsttree)
+        for pkg in self.marked4moving:
+            pkgnames=self.__find_other_pkgs(pkg, dsttree)
             for i in pkgnames:
                 Pkg(i, dsttree).remove()
 
+    # Used more than once filter functions
+
+    def __find_other_pkgs(self, pkg, tree):
+        ziewre=re.compile(string.join(pkg.name.split('-')[:-2], '-')+'-[^-]*-[^-]*$')
+        def filter_other_pkgs(x):
+            if ziewre.match(x) and not x == pkg.name:
+                return True
+            else:
+                return False
+        return filter(filter_other_pkgs, tree.pkgnames)
+
+    def __find_older_pkgs(self, pkg):
+        def filter_older_pkgs(x):
+            checking=x.split('-')
+            curpkg=pkg.name.split('-')
+            if checking[-2]<curpkg[-2]:
+                return True
+            elif checking[-2]==curpkg[-2]:
+                if checking[-1]<curpkg[-1]:
+                    return True
+                else:
+                    return False
+            else:
+                return False
+        return filter(filter_older_pkgs, self.__find_other_pkgs(pkg, self))
+
 
This page took 0.0532280000000001 seconds and 4 git commands to generate.