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
"""
def rpmhdr(pkg):
ts = rpm.ts()
- ts.setVSFlags(rpm._RPMVSF_NOSIGNATURES)
fdno = os.open(pkg, os.O_RDONLY)
hdr = ts.hdrFromFdno(fdno)
os.close(fdno)
self.__checksigns(dsttree, self.marked4moving, test = True)
self.__checkforobsoletes(dsttree, self.marked4moving, test = True)
self.__checkforrelease(dsttree, self.marked4moving, test = True)
-
- self.__rmolderfromsrc(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:
def mark4moving(self, wannabepkgs):
self.__mark4something(wannabepkgs, Pkg.mark4moving)
-
# Internal functions below
def __arch_stringify(self, list):
ret = []
- # XXX: is dist line in any config?
- dist = 'ac'
+ dist = config.ftp_dist;
for arch in list:
ret.append(dist + '-' + arch)
return ' '.join(ret)