pld-ftp-admin: scripts/move.py - formatting
glen
glen at pld-linux.org
Tue Jun 30 04:55:46 CEST 2009
Author: glen Date: Tue Jun 30 02:55:46 2009 GMT
Module: pld-ftp-admin Tag: HEAD
---- Log message:
- formatting
---- Files affected:
pld-ftp-admin/scripts:
move.py (1.14 -> 1.15)
---- Diffs:
================================================================
Index: pld-ftp-admin/scripts/move.py
diff -u pld-ftp-admin/scripts/move.py:1.14 pld-ftp-admin/scripts/move.py:1.15
--- pld-ftp-admin/scripts/move.py:1.14 Sun Jul 24 02:31:56 2005
+++ pld-ftp-admin/scripts/move.py Tue Jun 30 04:55:41 2009
@@ -7,19 +7,18 @@
from common import checkdir
import ftpio
from mailer import Message
-import config
-cval=config.value
+import config.value as config
-nocheckbuild=False
-if len(sys.argv) > 4 and sys.argv[1]=='-nb':
- nocheckbuild=True
- sys.argv=sys.argv[1:]
+nocheckbuild = False
+if len(sys.argv) > 4 and sys.argv[1] == '-nb':
+ nocheckbuild = True
+ sys.argv = sys.argv[1:]
if len(sys.argv) < 4:
- print "ERR: not enough parameters given"
- print "move.py [options] src-tree dst-tree package [package2 package3 ...]"
- print "\nOptions:"
- print " -nb Do not check if builds are finished.\n"
+ print >>sys.stderr, "ERR: not enough parameters given"
+ print >>sys.stderr, "move.py [options] src-tree dst-tree package [package2 package3 ...]"
+ print >>sys.stderr, "\nOptions:"
+ print >>sys.stderr, " -nb Do not check if builds are finished.\n"
sys.exit(1)
checkdir(sys.argv[1])
@@ -28,19 +27,19 @@
ftpio.connect('move')
if not ftpio.lock(sys.argv[1], True):
- print "ERR: %s tree already locked" % sys.argv[1]
+ print >>sys.stderr, "ERR: %s tree already locked" % sys.argv[1]
sys.exit(1)
if not ftpio.lock(sys.argv[2], True):
ftpio.unlock(sys.argv[1])
- print "ERR: %s tree already locked" % sys.argv[2]
+ print >>sys.stderr, "ERR: %s tree already locked" % sys.argv[2]
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])
if nocheckbuild:
- srctree.do_checkbuild=False
+ srctree.do_checkbuild = False
srctree.mark4moving(sys.argv[3:])
srctree.movepkgs(dsttree)
@@ -53,25 +52,31 @@
ftpio.unlock(sys.argv[1])
ftpio.unlock(sys.argv[2])
-if 'logs_list' not in cval:
+if 'logs_list' not in config:
sys.exit(0)
print 'Sending mail notification...',
-pkgs={}
+pkgs = {}
for pkg in srctree.marked4moving:
- requesters=[]
+ requesters = []
for bid in pkg.build.keys():
if pkg.build[bid].requester not in requesters:
requesters.append(pkg.build[bid].requester)
- pkgs[pkg.nvr]=requesters
+ pkgs[pkg.nvr] = requesters
-m=Message()
-m.set_headers(to=cval['logs_list'], subject='MOVED: %s => %s... %d packages' %
- (sys.argv[1], sys.argv[2], len(pkgs)))
-m.write(('SrcTree: %s DstTree: %s\n' +
- 'Amount: %d\n\n---- Moved:\n\n') % (sys.argv[1], sys.argv[2], len(pkgs)))
+m = Message()
+m.set_headers(
+ to = config['logs_list'],
+ subject = 'MOVED: %s => %s... %d packages' % (sys.argv[1], sys.argv[2], len(pkgs))
+)
+m.write(
+ (
+ 'SrcTree: %s DstTree: %s\n' +
+ 'Amount: %d\n\n---- Moved:\n\n'
+ ) % (sys.argv[1], sys.argv[2], len(pkgs))
+)
for nvr in sorted(pkgs.keys()):
m.write_line('%s ---- %s' % (nvr, ', '.join(pkgs[nvr])))
@@ -79,4 +84,3 @@
m.send()
print 'done.'
-
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-ftp-admin/scripts/move.py?r1=1.14&r2=1.15&f=u
More information about the pld-cvs-commit
mailing list