pld-ftp-admin: bin/pfa-from-incoming LC_ALL=C for sort and uniq
arekm
arekm at pld-linux.org
Fri Oct 11 21:40:52 CEST 2013
Author: arekm Date: Fri Oct 11 19:40:52 2013 GMT
Module: pld-ftp-admin Tag: HEAD
---- Log message:
LC_ALL=C for sort and uniq
---- Files affected:
pld-ftp-admin/bin:
pfa-from-incoming (1.29 -> 1.30)
---- Diffs:
================================================================
Index: pld-ftp-admin/bin/pfa-from-incoming
diff -u pld-ftp-admin/bin/pfa-from-incoming:1.29 pld-ftp-admin/bin/pfa-from-incoming:1.30
--- pld-ftp-admin/bin/pfa-from-incoming:1.29 Fri Oct 11 21:33:31 2013
+++ pld-ftp-admin/bin/pfa-from-incoming Fri Oct 11 21:40:47 2013
@@ -96,9 +96,9 @@
def move_noarch(f, arch, rpmfile, dstpkg):
if dstpkg.noarch_arch.has_key(rpmfile):
- os.system("LC_ALL=C rpm -qlp %s | LC_ALL=C sort > %s/files.new" %
+ os.system("rpm -qlp %s | LC_ALL=C sort > %s/files.new" %
(incoming_dir + arch + '/' + rpmfile, tmpdir))
- os.system("LC_ALL=C rpm -qRp %s | LC_ALL=C sort | uniq > %s/reqs.new" %
+ os.system("rpm -qRp %s | LC_ALL=C sort | LC_ALL=C uniq > %s/reqs.new" %
(incoming_dir + arch + '/' + rpmfile, tmpdir))
files_differ = False
@@ -116,9 +116,9 @@
rm(incoming_dir + arch + '/' + rpmfile)
else:
- os.system("LC_ALL=C rpm -qlp %s > %s/%s.filelist" %
+ os.system("LC_ALL=C rpm -qlp %s | LC_ALL=C sort > %s/%s.filelist" %
(incoming_dir + arch + '/' + rpmfile, noarchcachedir, rpmfile))
- os.system("LC_ALL=C rpm -qRp %s |sort|uniq > %s/%s.reqlist" %
+ os.system("rpm -qRp %s | LC_ALL=C sort | LC_ALL=C uniq > %s/%s.reqlist" %
(incoming_dir + arch + '/' + rpmfile, noarchcachedir, rpmfile))
f.write("file:noarch:%s\ninfo:noarch_arch:%s:%s\n" % (rpmfile, rpmfile, arch))
mv(incoming_dir + arch + '/' + rpmfile, default_to + 'noarch/RPMS')
================================================================
---- CVS-web:
http://cvs.pld-linux.org/pld-ftp-admin/bin/pfa-from-incoming?r1=1.29&r2=1.30
More information about the pld-cvs-commit
mailing list