pld-ftp-admin: scripts/from-incoming.py, scripts/gen-indexes.py, scripts/re...
glen
glen at pld-linux.org
Wed May 27 00:45:37 CEST 2009
Author: glen Date: Tue May 26 22:45:37 2009 GMT
Module: pld-ftp-admin Tag: HEAD
---- Log message:
- code formatting
---- Files affected:
pld-ftp-admin/scripts:
from-incoming.py (1.16 -> 1.17) , gen-indexes.py (1.24 -> 1.25) , remove.py (1.6 -> 1.7) , test-move.py (1.6 -> 1.7)
---- Diffs:
================================================================
Index: pld-ftp-admin/scripts/from-incoming.py
diff -u pld-ftp-admin/scripts/from-incoming.py:1.16 pld-ftp-admin/scripts/from-incoming.py:1.17
--- pld-ftp-admin/scripts/from-incoming.py:1.16 Wed Jan 7 21:43:26 2009
+++ pld-ftp-admin/scripts/from-incoming.py Wed May 27 00:45:32 2009
@@ -17,60 +17,57 @@
def rm(file):
os.remove(file)
- #print 'rm: '+file
def mv(src, dst):
- os.rename(src, dst+'/'+src.split('/')[-1])
- #print "mv: %s %s" % (src, dst+'/'+src.split('/')[-1])
+ os.rename(src, dst + '/' + src.split('/')[-1])
def findfiles(dir):
def filterinfos(x):
- if x[-11:]=='.uploadinfo':
+ if x[-11:] == '.uploadinfo':
return True
else:
return False
return filter(filterinfos, os.listdir(dir))
def getcontent(file):
- f=open(file, 'r')
- content=f.read()
+ f = open(file, 'r')
+ content = f.read()
f.close()
- if not content[-5:]=='\nEND\n':
+ if not content[-5:] == '\nEND\n':
return None
else:
return content[:-4]
-ftptree=BaseFtpTree(cval['default_to'])
+ftptree = BaseFtpTree(cval['default_to'])
if not ftpio.lock(cval['default_to']):
sys.exit(0)
-for uploadinfo in findfiles(incoming_dir+'SRPMS'):
- content=getcontent(incoming_dir+'SRPMS/'+uploadinfo)
+for uploadinfo in findfiles(incoming_dir + 'SRPMS'):
+ content = getcontent(incoming_dir + 'SRPMS/' + uploadinfo)
if not content:
continue # Uploading not finished
- pkg=BasePkg(uploadinfo[:-19], content=content)
- srpm=pkg.files['SRPMS'][0]
+ pkg = BasePkg(uploadinfo[:-19], content = content)
+ srpm = pkg.files['SRPMS'][0]
if ftptree.has_key(`pkg`):
- ftpio.log("%s already present in %s; removing newer files" %
- (srpm, ftptree))
- rm(incoming_dir+'SRPMS/'+srpm)
- f=open(default_to+'SRPMS/.metadata/'+srpm+'.info', 'a')
- bid=pkg.build.keys()[0]
- build=pkg.build[bid]
+ ftpio.log("%s already present in %s; removing newer files" % (srpm, ftptree))
+ rm(incoming_dir + 'SRPMS/' + srpm)
+ f = open(default_to + 'SRPMS/.metadata/' + srpm+'.info', 'a')
+ bid = pkg.build.keys()[0]
+ build = pkg.build[bid]
f.write("info:build:%s:requester:%s\ninfo:build:%s:requester_email:%s\n"
% (bid, build.requester, bid, build.requester_email))
f.close()
else:
- mv(incoming_dir+'SRPMS/'+srpm, default_to+'SRPMS/RPMS')
+ mv(incoming_dir + 'SRPMS/' + srpm, default_to + 'SRPMS/RPMS')
- f=open(default_to+'SRPMS/.metadata/'+srpm+'.info', 'w')
+ f = open(default_to + 'SRPMS/.metadata/' + srpm + '.info', 'w')
f.write(content)
f.close()
- rm(incoming_dir+'SRPMS/'+uploadinfo)
+ rm(incoming_dir + 'SRPMS/' + uploadinfo)
def send_noarch_msg(files_differ, reqs_differ, pkg, rpm, arch):
req_email=pkg.build[pkg.lastbid].requester_email
@@ -125,73 +122,77 @@
def move_noarch(f, arch, rpm, dstpkg):
if dstpkg.noarch_arch.has_key(rpm):
os.system("rpm -qlp %s | LC_ALL=C sort > %s/files.new" %
- (incoming_dir+arch+'/'+rpm, tmpdir))
+ (incoming_dir + arch + '/' + rpm, tmpdir))
os.system("rpm -qRp %s | LC_ALL=C sort | uniq > %s/reqs.new" %
- (incoming_dir+arch+'/'+rpm, tmpdir))
+ (incoming_dir + arch + '/' + rpm, tmpdir))
- files_differ=False
- reqs_differ=False
+ files_differ = False
+ reqs_differ = False
if os.system("diff -u %s/%s.filelist %s/files.new > %s/files.diff" %
(noarchcachedir, rpm, tmpdir, tmpdir)):
- files_differ=True
+ files_differ = True
if os.system("diff -u %s/%s.reqlist %s/reqs.new > %s/reqs.diff" %
(noarchcachedir, rpm, tmpdir, tmpdir)):
- reqs_differ=True
+ reqs_differ = True
if files_differ or reqs_differ:
send_noarch_msg(files_differ, reqs_differ, dstpkg, rpm, arch)
- rm(incoming_dir+arch+'/'+rpm)
+ rm(incoming_dir + arch + '/' + rpm)
else:
os.system("rpm -qlp %s > %s/%s.filelist" %
- (incoming_dir+arch+'/'+rpm, noarchcachedir, rpm))
+ (incoming_dir + arch + '/' + rpm, noarchcachedir, rpm))
os.system("rpm -qRp %s |sort|uniq > %s/%s.reqlist" %
- (incoming_dir+arch+'/'+rpm, noarchcachedir, rpm))
+ (incoming_dir + arch + '/' + rpm, noarchcachedir, rpm))
f.write("file:noarch:%s\ninfo:noarch_arch:%s:%s\n" % (rpm, rpm, arch))
- mv(incoming_dir+arch+'/'+rpm, default_to+'noarch/RPMS')
+ mv(incoming_dir + arch + '/' + rpm, default_to + 'noarch/RPMS')
for arch in ftp_archs:
for uploadinfo in findfiles(incoming_dir+arch):
- content=getcontent(incoming_dir+arch+'/'+uploadinfo)
+ content = getcontent(incoming_dir + arch + '/' + uploadinfo)
if not content:
+ print "%s not finished uploading" % uploadinfo
continue # Uploading not finished
- srcpkg=BasePkg(uploadinfo[:-19], content=content)
- srpm=srcpkg.files['SRPMS'][0]
+ srcpkg = BasePkg(uploadinfo[:-19], content = content)
+ srpm = srcpkg.files['SRPMS'][0]
if not ftptree.has_key(`srcpkg`):
continue # We require the src.rpm to be present
- dstpkg=BasePkg(`srcpkg`, ftptree)
+ dstpkg = BasePkg(`srcpkg`, ftptree)
if dstpkg.files.has_key(arch):
ftpio.log("files from %s for arch %s already present in %s; removing newer files" % (`srcpkg`, arch, ftptree))
for rpm in srcpkg.files['ARCH']:
try:
- rm(incoming_dir+arch+'/'+rpm)
+ rm(incoming_dir + arch + '/'+rpm)
except OSError, e:
- l = "Removing %s problem: %s" % (incoming_dir+arch+'/'+rpm, e)
+ l = "Removing %s problem: %s" % (incoming_dir + arch + '/' + rpm, e)
ftpio.log(l)
print l
- rm(incoming_dir+arch+'/'+uploadinfo)
+ rm(incoming_dir + arch + '/' + uploadinfo)
continue
- f=open(default_to+'SRPMS/.metadata/'+srpm+'.info', 'a')
+ f = open(default_to + 'SRPMS/.metadata/' + srpm + '.info', 'a')
for rpm in srcpkg.files['ARCH']:
- if rpm[-11:]=='.noarch.rpm' and config.separate_noarch:
+ if rpm[-11:] == '.noarch.rpm' and config.separate_noarch:
move_noarch(f, arch, rpm, dstpkg)
else:
f.write("file:%s:%s\n" % (arch, rpm))
+ srcfile = incoming_dir + arch + '/' + rpm
+
+ dstfile = default_to + arch + '/RPMS'
+
try:
- mv(incoming_dir+arch+'/'+rpm, default_to+arch+'/RPMS')
+ mv(srcfile, dstfile)
except OSError, e:
- l = "Moving %s to %s problem: %s" % (incoming_dir+arch+'/'+rpm, default_to+arch+'/RPMS', e)
+ l = "Moving %s to %s problem: %s" % (srcfile, dstfile, e)
ftpio.log(l)
print l
f.close()
- rm(incoming_dir+arch+'/'+uploadinfo)
+ rm(incoming_dir + arch + '/' + uploadinfo)
ftpio.unlock(cval['default_to'])
-
================================================================
Index: pld-ftp-admin/scripts/gen-indexes.py
diff -u pld-ftp-admin/scripts/gen-indexes.py:1.24 pld-ftp-admin/scripts/gen-indexes.py:1.25
--- pld-ftp-admin/scripts/gen-indexes.py:1.24 Fri Nov 14 15:37:34 2008
+++ pld-ftp-admin/scripts/gen-indexes.py Wed May 27 00:45:32 2009
@@ -12,8 +12,8 @@
try:
opts, args = getopt.getopt(sys.argv[1:], None, ["nopoldek", "noyum", "norpmrepo", "poldek", "yum", "rpmrepo"])
except getopt.GetoptError:
- print "ERR: not enough parameters given"
- print "gen-indexes.py [--[no]poldek] [--[no]yum] [--[no]rpmrepo] tree [tree2...]"
+ print >>sys.stderr, "ERR: not enough parameters given"
+ print >>sys.stderr, "gen-indexes.py [--[no]poldek] [--[no]yum] [--[no]rpmrepo] tree [tree2...]"
sys.exit(1)
do_poldek = True
@@ -36,57 +36,54 @@
do_rpmrepo = True
if not do_poldek and not do_yum and not do_rpmrepo:
- print "ERR: speciy at least one action"
+ print >>sys.stderr, "ERR: speciy at least one action"
sys.exit(1)
-trees=args
+trees = args
for tree in trees:
checkdir(tree)
ftpio.connect('gen-indexes')
-locked=[]
+locked = []
for tree in trees:
if ftpio.lock(tree, True):
locked.append(tree)
else:
- print "ERR: %s tree already locked" % tree
+ print >>sys.stderr, "ERR: %s tree already locked" % tree
for i in locked:
ftpio.unlock(i)
sys.exit(1)
-home=os.environ['HOME']
+home = os.environ['HOME']
os.umask(022)
os.nice(19)
if do_poldek:
+ poldek = '%s.stat/bin/poldek-new --cachedir=%s/tmp/poldek --conf %s.stat/etc/poldek.conf --mkidxz' % (ftp_dir, home, ftp_dir)
+
for tree in trees:
print '-------------------------- %s --------------------------' % tree
for arch in all_ftp_archs:
print 'generate poldek index for %s' % arch
- if config.old_poldek:
- os.system('%s.stat/bin/poldek --cachedir=%s/tmp/poldek -c %s.stat/etc/poldek.conf -s %s%s/%s/RPMS/ --mkidxz' %
- (ftp_dir,home,ftp_dir,ftp_dir,tree,arch))
- else:
- if config.poldek_indexes != "old":
- os.system('%s.stat/bin/poldek-new --cachedir=%s/tmp/poldek --conf %s.stat/etc/poldek.conf -s %s%s/%s/RPMS/ --mkidxz --mkidx-type pndir' %
- (ftp_dir,home,ftp_dir,ftp_dir,tree,arch))
- if config.poldek_indexes != "new":
- os.system('%s.stat/bin/poldek-new --cachedir=%s/tmp/poldek --conf %s.stat/etc/poldek.conf -s %s%s/%s/RPMS/ --mkidxz --mkidx-type pdir' %
- (ftp_dir,home,ftp_dir,ftp_dir,tree,arch))
+ if config.poldek_indexes != "old":
+ os.system('%s -s %s%s/%s/RPMS/ --mkidxz --mkidx-type pndir' % (poldek, ftp_dir, tree, arch))
+ if config.poldek_indexes != "new":
+ os.system('%s -s %s%s/%s/RPMS/ --mkidxz --mkidx-type pdir' % (poldek, ftp_dir, tree, arch))
if do_yum:
os.system('set -x; cd %s.stat/repodata && cvs up comps.xml' % ftp_dir)
+ yum = '%s.stat/bin/createrepo -d -g %s.stat/repodata/comps.xml' % (ftp_dir, ftp_dir)
for tree in trees:
print '-------------------------- %s --------------------------' % tree
+ cachedir = '%s/tmp/createrepo/%s' % (home, tree)
for arch in all_ftp_archs:
print 'generate repodata for %s using createrepo' % arch
# Creating indexes for yum and other supporting xml repodata.
- os.system('time %s.stat/bin/createrepo -d -g %s.stat/repodata/comps.xml --cache %s/tmp/createrepo/%s-%s %s%s/%s/RPMS' %
- (ftp_dir,ftp_dir,home,tree,arch,ftp_dir,tree,arch))
+ os.system('time %s --cache %s-%s %s%s/%s/RPMS' % (yum, cachedir, arch, ftp_dir, tree, arch))
if do_rpmrepo:
os.system('set -x; cd %s.stat/repodata && cvs up comps.xml' % ftp_dir)
================================================================
Index: pld-ftp-admin/scripts/remove.py
diff -u pld-ftp-admin/scripts/remove.py:1.6 pld-ftp-admin/scripts/remove.py:1.7
--- pld-ftp-admin/scripts/remove.py:1.6 Sat Jul 23 18:24:50 2005
+++ pld-ftp-admin/scripts/remove.py Wed May 27 00:45:32 2009
@@ -22,6 +22,7 @@
try:
tree=ftptree.FtpTree(sys.argv[1])
+ #tree.do_checkbuild=False
tree.mark4removal(sys.argv[2:])
tree.removepkgs()
except ftptree.SomeError:
================================================================
Index: pld-ftp-admin/scripts/test-move.py
diff -u pld-ftp-admin/scripts/test-move.py:1.6 pld-ftp-admin/scripts/test-move.py:1.7
--- pld-ftp-admin/scripts/test-move.py:1.6 Tue Jun 21 00:27:06 2005
+++ pld-ftp-admin/scripts/test-move.py Wed May 27 00:45:32 2009
@@ -27,8 +27,8 @@
sys.exit(1)
try:
- srctree=ftptree.FtpTree(sys.argv[1], loadall=True)
- dsttree=ftptree.FtpTree(sys.argv[2])
+ srctree = ftptree.FtpTree(sys.argv[1], loadall = True)
+ dsttree = ftptree.FtpTree(sys.argv[2])
srctree.mark4moving(sys.argv[3:])
except ftptree.SomeError:
# In case of problems we need to unlock the trees before exiting
@@ -41,4 +41,3 @@
ftpio.unlock(sys.argv[1])
ftpio.unlock(sys.argv[2])
-
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-ftp-admin/scripts/from-incoming.py?r1=1.16&r2=1.17&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-ftp-admin/scripts/gen-indexes.py?r1=1.24&r2=1.25&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-ftp-admin/scripts/remove.py?r1=1.6&r2=1.7&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-ftp-admin/scripts/test-move.py?r1=1.6&r2=1.7&f=u
More information about the pld-cvs-commit
mailing list