# vi: encoding=utf-8 ts=8 sts=4 sw=4 et
-import os, config, string, urllib, re
+import os, config, string, urllib, re, rpm
from common import fileexists, noarchcachedir
from baseftptree import BasePkg, BaseFtpTree
errnum=0
SomeError="Oh no"
+quietmode=False
def bailoutonerror():
if not errnum == 0:
raise SomeError
def pinfo(msg):
- print msg
+ print 'INFO: ' + msg
def perror(msg):
global errnum
#print 'rm: '+file
def mv(src, dst):
- os.rename(src, dst+'/'+src.split('/')[-1])
- #print "mv: %s %s" % (src, dst+'/'+src.split('/')[-1])
+ try:
+ os.rename(src, dst+'/'+src.split('/')[-1])
+ except OSError, e:
+ pinfo "os.rename(%s, %s): %s" % (src, dst+'/'+src.split('/')[-1], e)
class Pkg(BasePkg):
- def __init__(self, name, tree):
+ def __init__(self, nvr, tree):
+ BasePkg.__init__(self, nvr, tree)
+ self.name=string.join(nvr.split('-')[:-2], '-')
+ self.version=nvr.split('-')[-2]
+ self.release=nvr.split('-')[-1]
self.marked4removal=False
self.marked4moving=False
- BasePkg.__init__(self, name, tree)
+ self.marked4movingpool=[]
+ self.errors=[]
+ self.warnings=[]
+
+ def __cmp__(self, pkg):
+ if self.name > pkg.name:
+ return 1
+ elif self.name < pkg.name:
+ return -1
+ else:
+ return rpm.labelCompare(('0', self.version, self.release),
+ ('0', pkg.version, pkg.release))
def mark4moving(self):
if not self.marked4moving:
+ # Only one pkg in this pool can be marked for moving
+ for pkg in self.marked4movingpool:
+ pkg.unmark4moving()
self.tree.marked4moving.append(self)
self.marked4moving=True
+ def unmark4moving(self):
+ if self.marked4moving:
+ self.tree.marked4moving.remove(self)
+ self.marked4moving=False
+
def mark4removal(self):
if not self.marked4removal:
self.tree.marked4removal.append(self)
self.marked4removal=True
+ def error(self, msg):
+ self.errors.append(msg)
+ if not quietmode:
+ perror('%s %s' % (self.nvr, msg))
+
+ def warning(self, msg):
+ self.warnings.append(msg)
+ if not quietmode:
+ pwarning('%s %s' % (self.nvr, msg))
+
def load(self, content=None):
BasePkg.load(self, content)
if self.info.has_key('move'):
self.mark4moving()
def writeinfo(self):
- f=open(self.tree.basedir+'/SRPMS/.metadata/'+self.name+'.src.rpm.info', 'w')
+ f=open(self.tree.basedir+'/SRPMS/.metadata/'+self.nvr+'.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():
rm(noarchcachedir+rpm+'.filelist')
if fileexists(noarchcachedir+rpm+'.reqlist'):
rm(noarchcachedir+rpm+'.reqlist')
- rm(self.tree.basedir+'/SRPMS/.metadata/'+self.name+'.src.rpm.info')
+ rm(self.tree.basedir+'/SRPMS/.metadata/'+self.nvr+'.src.rpm.info')
def move(self, dsttree):
- if dsttree.has_key(self.name):
+ if dsttree.has_key(self.nvr):
movedany=False
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))
+ if arch in dsttree[self.nvr].files.keys():
+ pinfo("Arch %s for %s is already present in dest tree; removing from srctree" % (arch, self.nvr))
for rpm in self.files[arch]:
rm(self.tree.basedir+'/'+arch+'/RPMS/'+rpm)
else:
movedany=True
- dsttree[self.name].files[arch]=self.files[arch]
+ dsttree[self.nvr].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].build[bid]=self.build[bid]
- dsttree[self.name].writeinfo()
- rm(self.tree.basedir+'/SRPMS/.metadata/'+self.name+'.src.rpm.info')
+ dsttree[self.nvr].build[bid]=self.build[bid]
+ dsttree[self.nvr].writeinfo()
+ rm(self.tree.basedir+'/SRPMS/.metadata/'+self.nvr+'.src.rpm.info')
else:
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/')
+ mv(self.tree.basedir+'/SRPMS/.metadata/'+self.nvr+'.src.rpm.info', dsttree.basedir+'/SRPMS/.metadata/')
class FtpTree(BaseFtpTree):
def keys(self):
return self.pkgnames
+ def values(self):
+ return self.loadedpkgs.values()
+
+ def checktree(self, dsttree):
+ self.__checkbuild(self.loadedpkgs.values())
+ self.__checkarchs(dsttree, self.loadedpkgs.values())
+
def testmove(self, dsttree):
- self.__checkbuild()
- self.__checkarchs(dsttree)
+ self.__checkbuild(self.marked4moving)
+ self.__checkarchs(dsttree, self.marked4moving)
def movepkgs(self, dsttree):
if self.do_checkbuild:
- self.__checkbuild()
+ self.__checkbuild(self.marked4moving)
bailoutonerror()
- self.__checkarchs(dsttree)
+ self.__checkarchs(dsttree, self.marked4moving)
bailoutonerror()
self.__rmolderfromsrc()
self.__rmotherfromdst(dsttree)
pkg.move(dsttree)
def removepkgs(self):
+ if self.do_checkbuild:
+ self.__checkbuild(self.marked4removal)
+ bailoutonerror()
for pkg in self.marked4removal:
pkg.remove()
perror('%s not found in source tree' % pkgname)
bailoutonerror()
- def __checkbuild(self):
- f=urllib.urlopen('http://ep09.pld-linux.org/~builderth/queue.txt')
+ def __checkbuild(self, marked):
+ f=urllib.urlopen(config.builderqueue)
#f=open('queue.txt')
requests={}
reid=re.compile(r'^.*id=(.*) pri.*$')
elif i[0]=='b':
requests[id]=requests[id]+i
f.close()
- for pkg in self.marked4moving:
+ for pkg in marked:
for bid in pkg.build.keys():
if requests.has_key(bid) and not requests[bid].find('?') == -1:
- perror("%s (buildid %s) building not finished" % (pkg,bid))
+ pkg.error("(buildid %s) building not finished" % bid)
- def __checkarchs(self, dsttree):
- for pkg in self.marked4moving:
+ def __checkarchs(self, dsttree, marked):
+ for pkg in marked:
if len(pkg.files.keys()) <= 1:
- perror('%s has only src.rpm built' % pkg)
+ pkg.error('has only src.rpm built')
continue
otherpkgnames=self.__find_other_pkgs(pkg, dsttree)
if otherpkgnames: # check if we're not removing some archs
if arch not in pkg.files.keys():
missingarchs.append(arch)
if missingarchs:
- perror('%s moving would remove archs: %s' %
- (pkg, missingarchs))
+ pkg.error('moving would remove archs: %s' % 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):
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))
+ pkg.warning('not built for archs: %s' % 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], '-')+'-[^-]*-[^-]*$')
+ escapedpkgname=pkg.name.replace('.', '\.').replace('+', '\+')
+ ziewre=re.compile(escapedpkgname+'-[^-]*-[^-]*$')
def filter_other_pkgs(x):
- if ziewre.match(x) and not x == pkg.name:
+ if ziewre.match(x) and not x == pkg.nvr:
return True
else:
return False
def __find_older_pkgs(self, pkg):
def filter_older_pkgs(x):
- checking=x.split('-')
- curpkg=pkg.name.split('-')
- if checking[-2]<curpkg[-2]:
+ c=x.split('-')
+ rc = rpm.labelCompare(('0', pkg.version, pkg.release),
+ ('0', c[-2], c[-1]))
+ if rc == 1: # pkg > x
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))
-
projects / projects / pld-ftp-admin.git / blobdiff