pkg = nvr.split('-')[:-2]
return pkg[-1] == 'debuginfo'
+ def is_sourcefile(self, file):
+ """
+ returns true if file is source package
+ """
+ return file[-8:] == '.src.rpm'
+
+ # returns true if package build is integer
+ def is_release(self):
+ """
+ To account Release tags with subver macros, we consider integer release
+ if it contains odd number of dots:
+
+ 1 -> True
+ 0.1 -> False
+ 0.%{subver}.%{rel}, %{rel} = 1 -> 0.20010.1 -> True
+ 0.%{subver}.%{rel}, %{rel} = 0.1 -> 0.20010.0.1 -> False
+ """
+ return self.release.count('.') % 2 == 0
+
def mark4moving(self):
if not self.marked4moving:
# Only one pkg in this pool can be marked for moving
for arch in self.files.keys():
for rpm in self.files[arch]:
f.write("file:%s:%s\n" % (arch, rpm))
-
+
def remove(self, test = False):
"""
Remove package from ftp
rm(noarchcachedir + rpm + '.reqlist', test)
rm(self.tree.basedir + '/SRPMS/.metadata/' + self.nvr + '.src.rpm.info', test)
- def rpmfiles(self):
+ def rpmfiles(self, debugfiles = True, sourcefiles = True):
"""
Return rpm files related to this package
"""
for arch, rpms in self.files.items():
for nvr in rpms:
if self.is_debuginfo(nvr):
- files.append(self.tree.basedir + '/' + arch + '/debuginfo/' + nvr)
+ if debugfiles:
+ files.append(self.tree.basedir + '/' + arch + '/debuginfo/' + nvr)
else:
- files.append(self.tree.basedir + '/' + arch + '/RPMS/' + nvr)
+ if self.is_sourcefile(nvr):
+ if sourcefiles:
+ files.append(self.tree.basedir + '/' + arch + '/RPMS/' + nvr)
+ else:
+ files.append(self.tree.basedir + '/' + arch + '/RPMS/' + nvr)
return files
+ def obsoletes(self):
+ """
+ Return obsoletes for all packages in Pkg:
+
+ {'php-geshi': set(['geshi'])}
+
+ """
+ def rpmhdr(pkg):
+ ts = rpm.ts()
+ fdno = os.open(pkg, os.O_RDONLY)
+ hdr = ts.hdrFromFdno(fdno)
+ os.close(fdno)
+ return hdr
+
+ obsoletes = {}
+ for rpmfile in self.rpmfiles():
+ if not os.path.exists(rpmfile):
+ continue
+ hdr = rpmhdr(rpmfile)
+ if not hdr[rpm.RPMTAG_OBSOLETES]:
+ continue
+
+ name = hdr[rpm.RPMTAG_NAME]
+ if not name in obsoletes:
+ obsoletes[name] = set()
+
+ for tag in hdr[rpm.RPMTAG_OBSOLETES]:
+ obsoletes[name].add(tag)
+
+ return obsoletes
+
def move(self, dsttree, test = False):
if dsttree.has_key(self.nvr):
movedany = False
def testmove(self, dsttree, archivetree = None):
self.__checkbuild(self.marked4moving)
self.__checkarchs(dsttree, self.marked4moving)
+ self.__checkduplicates(self.marked4moving)
self.__checksigns(dsttree, self.marked4moving, test = True)
-
- self.__rmolderfromsrc(test = True)
+ self.__checkforobsoletes(dsttree, self.marked4moving, test = True)
+ self.__checkforrelease(dsttree, self.marked4moving, test = True)
+
+ if not self.treename.count("archive"):
+ self.__rmolderfromsrc(test = True)
+
self.__rmotherfromdst(dsttree, test = True, archivetree = archivetree)
for pkg in self.marked4moving:
self.__checksigns(dsttree, self.marked4moving)
bailoutonerror()
- self.__rmolderfromsrc()
+ if not self.treename.count("archive"):
+ self.__rmolderfromsrc()
+
self.__rmotherfromdst(dsttree, archivetree = archivetree)
for pkg in self.marked4moving:
pkg.move(dsttree)
- def rpmfiles(self):
+ def rpmfiles(self, debugfiles = True, sourcefiles = True):
if self.do_checkbuild:
self.__checkbuild(self.marked4moving)
files = []
for pkg in self.marked4moving:
- files += pkg.rpmfiles()
+ files += pkg.rpmfiles(debugfiles = debugfiles, sourcefiles = sourcefiles)
return files
def removepkgs(self):
def mark4moving(self, wannabepkgs):
self.__mark4something(wannabepkgs, Pkg.mark4moving)
-
# Internal functions below
+ def __arch_stringify(self, list):
+ ret = []
+ dist = config.ftp_dist;
+ for arch in list:
+ ret.append(dist + '-' + arch)
+ return ' '.join(ret)
def __loadpkgnames(self):
def checkfiletype(name):
def __mark4something(self, wannabepkgs, markfunction):
def chopoffextension(pkg):
- found=pkg.find('.src.rpm')
- if found==-1:
+ found = pkg.find('.src.rpm')
+ if found == -1:
return pkg
else:
return pkg[:found]
+
for wannabepkg in wannabepkgs:
- pkgname=chopoffextension(wannabepkg)
+ pkgname = chopoffextension(wannabepkg)
if pkgname in self.pkgnames:
if not pkgname in self.loadedpkgs.keys():
self.loadedpkgs[pkgname]=Pkg(pkgname, self)
if arch not in pkg.files.keys():
missingarchs.append(arch)
if missingarchs:
- pkg.error('moving would remove archs: %s' % missingarchs)
+ pkg.error('moving would remove archs: %s' % self.__arch_stringify(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)
- pkg.warning('not built for archs: %s' % missingarchs)
+ pkg.warning('not built for archs: %s' % self.__arch_stringify(missingarchs))
+
+ def __checkduplicates(self, marked):
+ """
+ Checks if marked packages contain duplicate packages (with different versions)
+ """
+ for pkg in marked:
+ olderpkgnames = self.__find_older_pkgs(pkg)
+ for i in olderpkgnames:
+ markednames = [str(x) for x in marked]
+ if i in markednames:
+ pkg.error('duplicate package: %s' % i)
def __rmolderfromsrc(self, test = False):
for pkg in self.marked4moving:
unsigned = 0
for file in pkg.rpmfiles():
if not is_signed(file):
- unsigned += 1;
+ unsigned += 1
if unsigned != 0:
if test == True:
pkg.warning('%d files not signed' % unsigned)
else:
pkg.error('%d files not signed' % unsigned)
+
+ def __checkforobsoletes(self, tree, pkgs, test = False):
+ """
+ Checks queue file if package obsoletes something in destination tree and suggest for removal.
+
+ Only NAME tag is compared, i.e virtual packages do not get reported.
+
+ """
+ if test != True:
+ return
+
+ def findbyname(name):
+ def x(nvr):
+ return '-'.join(nvr.split('-')[:-2]) == name
+ return filter(x, tree.pkgnames)
+
+ for pkg in pkgs:
+ obsoletes = pkg.obsoletes()
+ if not obsoletes:
+ continue
+
+ for pn, setlist in obsoletes.items():
+ for item in setlist:
+ p = findbyname(item)
+ if p:
+ pkg.warning('obsoletes %s (via %s) in dest tree, perhaps you want rmpkg' % (p,pn))
+
+ def __checkforrelease(self, tree, pkgs, test = False):
+ """
+ Checks queue file if package release is non integer.
+
+ """
+ if test != True:
+ return
+
+ for pkg in pkgs:
+ if not pkg.is_release():
+ pkg.warning('non-integer release: %s' % pkg.release)
projects / projects / pld-ftp-admin.git / blobdiff