-#!/usr/bin/env python
# vi: encoding=utf-8 ts=8 sts=4 sw=4 et
-import sys, os, config, string, urllib, re
+import os, config, string, urllib, re
from common import fileexists, noarchcachedir
+from baseftptree import BasePkg, BaseFtpTree
errnum=0
+SomeError="Oh no"
+
def bailoutonerror():
if not errnum == 0:
print "%d error(s) encountered... aborting" % errnum
- sys.exit(1)
+ raise SomeError
def pinfo(msg):
print msg
def perror(msg):
global errnum
errnum=errnum+1
- print msg
+ print 'ERR: ' + msg
+
+def pwarning(msg):
+ print 'WARN: ' + msg
def rm(file):
- #os.remove()
- print 'rm: '+file
+ os.remove(file)
+ #print 'rm: '+file
def mv(src, dst):
- #os.rename()
- print "mv: %s %s" % (src, dst+'/'+src.split('/')[-1])
+ os.rename(src, dst+'/'+src.split('/')[-1])
+ #print "mv: %s %s" % (src, dst+'/'+src.split('/')[-1])
-class Build:
- def __init__(self):
- self.requester=''
- self.requester_email=''
-
-class Pkg:
+class Pkg(BasePkg):
def __init__(self, name, tree):
- self.file={}
- self.info={}
- self.build={}
- self.tree=tree
- self.name=name
- self.loaded=False
self.marked4removal=False
self.marked4moving=False
- self.load()
-
- def __repr__(self):
- return self.name
+ BasePkg.__init__(self, name, tree)
def mark4moving(self):
if not self.marked4moving:
self.tree.marked4removal.append(self)
self.marked4removal=True
- def load(self):
- f=open(self.tree.basedir+'/SRPMS/.metadata/'+self.name+'.src.rpm.info', 'r')
- for entry in f.readlines():
- i=string.split(string.strip(entry), ':')
- if i[0] == 'info':
- if len(i)==3:
- self.info[i[1]]=i[2]
- elif i[1]=='build':
- if not self.build.has_key(i[2]):
- self.build[i[2]]=Build()
- if i[3]=='requester':
- self.build[i[2]].requester=i[4]
- elif i[3]=='requester_email':
- self.build[i[2]].requester_email=i[4]
- else:
- self.info[i[1]]=i[2:]
- elif i[0] == 'file':
- if not self.file.has_key(i[1]):
- self.file[i[1]]=[]
- self.file[i[1]].append(i[2])
- f.close()
- self.loaded=True
+ def load(self, content=None):
+ BasePkg.load(self, content)
if self.info.has_key('move'):
self.mark4moving()
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():
f.write("info:%s:%s\n" % (key, string.join(self.info[key], ':')))
- for arch in self.file.keys():
- for rpm in self.file[arch]:
+ for arch in self.files.keys():
+ for rpm in self.files[arch]:
f.write("file:%s:%s\n" % (arch, rpm))
def remove(self):
- for arch in self.file.keys():
- for rpm in self.file[arch]:
+ for arch in self.files.keys():
+ for rpm in self.files[arch]:
rm(self.tree.basedir+'/'+arch+'/RPMS/'+rpm)
if arch=='noarch':
if fileexists(noarchcachedir+rpm+'.filelist'):
def move(self, dsttree):
if dsttree.has_key(self.name):
movedany=False
- for arch in self.file.keys():
- if arch in dsttree[self.name].file.keys():
+ for arch in self.files.keys():
+ if arch in dsttree[self.name].files.keys():
pinfo("Arch %s for %s is already present in dest tree; removing from srctree" % (arch, self.name))
- for rpm in self.file[arch]:
+ for rpm in self.files[arch]:
rm(self.tree.basedir+'/'+arch+'/RPMS/'+rpm)
else:
movedany=True
- dsttree[self.name].file[arch]=self.file[arch]
- for rpm in self.file[arch]:
+ dsttree[self.name].files[arch]=self.files[arch]
+ for rpm in self.files[arch]:
mv(self.tree.basedir+'/'+arch+'/RPMS/'+rpm, dsttree.basedir+'/'+arch+'/RPMS/')
if movedany:
for bid in self.build.keys():
dsttree[self.name].writeinfo()
rm(self.tree.basedir+'/SRPMS/.metadata/'+self.name+'.src.rpm.info')
else:
- for arch in self.file.keys():
- for rpm in self.file[arch]:
+ for arch in self.files.keys():
+ for rpm in self.files[arch]:
mv(self.tree.basedir+'/'+arch+'/RPMS/'+rpm, dsttree.basedir+'/'+arch+'/RPMS/')
mv(self.tree.basedir+'/SRPMS/.metadata/'+self.name+'.src.rpm.info', dsttree.basedir+'/SRPMS/.metadata/')
-class FtpTree:
+class FtpTree(BaseFtpTree):
def __init__(self, tree, loadall=False):
- self.basedir=config.value['ftp_dir']+'/'+tree
+ BaseFtpTree.__init__(self, tree)
self.loadedpkgs={}
self.marked4removal=[]
self.marked4moving=[]
if loadall:
for pkgname in self.pkgnames:
self.loadedpkgs[pkgname]=Pkg(pkgname, self)
+ # Tests:
+ self.do_checkbuild=True
def __getitem__(self, key):
if self.loadedpkgs.has_key(key):
return pkg
else:
raise KeyError, key
+
def has_key(self, key):
if key in self.pkgnames:
return True
else:
return False
+
def keys(self):
return self.pkgnames
self.__checkarchs(dsttree)
def movepkgs(self, dsttree):
- self.__checkbuild()
+ if self.do_checkbuild:
+ self.__checkbuild()
bailoutonerror()
self.__checkarchs(dsttree)
bailoutonerror()
self.loadedpkgs[pkgname]=Pkg(pkgname, self)
markfunction(self.loadedpkgs[pkgname])
else:
- perror(pkgname+" was not found in source tree")
+ perror('%s not found in source tree' % pkgname)
bailoutonerror()
def __checkbuild(self):
- #f=urllib.urlopen('http://ep09.pld-linux.org/~builderth/queue.txt')
- f=open('queue.txt')
+ f=urllib.urlopen('http://ep09.pld-linux.org/~builderth/queue.txt')
+ #f=open('queue.txt')
requests={}
reid=re.compile(r'^.*id=(.*) pri.*$')
regb=re.compile(r'^group:.*$|builders:.*$', re.M)
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))
+ perror("%s (buildid %s) building not finished" % (pkg,bid))
def __checkarchs(self, dsttree):
for pkg in self.marked4moving:
+ if len(pkg.files.keys()) <= 1:
+ perror('%s has only src.rpm built' % pkg)
+ continue
otherpkgnames=self.__find_other_pkgs(pkg, dsttree)
- curarchs=[]
- missingarchs=[]
- for somepkg in otherpkgnames:
- curarchs.extend(Pkg(somepkg, dsttree).file.keys())
- for arch in curarchs:
- if arch not in pkg.file.keys():
- missingarchs.append(arch)
- if missingarchs:
- perror('Moving %s would remove archs: %s' % (pkg, missingarchs))
+ if otherpkgnames: # check if we're not removing some archs
+ curarchs=[]
+ missingarchs=[]
+ for somepkg in otherpkgnames:
+ curarchs.extend(Pkg(somepkg, dsttree).files.keys())
+ for arch in curarchs:
+ if arch not in pkg.files.keys():
+ missingarchs.append(arch)
+ if missingarchs:
+ perror('%s moving would remove archs: %s' %
+ (pkg, missingarchs))
+ else: # warn if a package isn't built for all archs
+ if (config.separate_noarch and 'noarch' in pkg.files.keys() and
+ len(pkg.files.keys())==2):
+ continue
+ elif len(pkg.files.keys()) != len(config.ftp_archs)+1:
+ missingarchs=[]
+ for arch in config.ftp_archs:
+ if arch not in pkg.files.keys():
+ missingarchs.append(arch)
+ pwarning('%s not built for archs: %s' %
+ (pkg, missingarchs))
def __rmolderfromsrc(self):
for pkg in self.marked4moving:
# Used more than once filter functions
def __find_other_pkgs(self, pkg, tree):
- ziewre=re.compile(string.join(pkg.name.split('-')[:-2], '-')+'-[^-]*-[^-]*$')
+ pkgname=string.join(pkg.name.split('-')[:-2], '-')
+ escapedpkgname=pkgname.replace('.', '\.').replace('+', '\+')
+ ziewre=re.compile(escapedpkgname+'-[^-]*-[^-]*$')
def filter_other_pkgs(x):
if ziewre.match(x) and not x == pkg.name:
return True
projects / projects / pld-ftp-admin.git / blobdiff