From: Arkadiusz Miśkiewicz <arekm@maven.pl>
Date: Fri, 11 Oct 2013 19:40:47 +0000 (+0000)
Subject: LC_ALL=C for sort and uniq
X-Git-Url: https://git.pld-linux.org/?p=projects%2Fpld-ftp-admin.git;a=commitdiff_plain;h=ca2e224a048788c290202c040d4d7521ec7cca1c

LC_ALL=C for sort and uniq

Changed files:
    bin/pfa-from-incoming -> 1.30
---

diff --git a/bin/pfa-from-incoming b/bin/pfa-from-incoming
index 63e7d89..0b8d9df 100644
--- a/bin/pfa-from-incoming
+++ b/bin/pfa-from-incoming
@@ -96,9 +96,9 @@ Subject: %s
 
 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 @@ def move_noarch(f, arch, rpmfile, dstpkg):
 
         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')