diff options
| author | Arkadiusz Miśkiewicz | 2013-10-11 19:40:47 (GMT) |
|---|---|---|
| committer | Arkadiusz Miśkiewicz | 2013-10-11 19:40:47 (GMT) |
| commit | ca2e224a048788c290202c040d4d7521ec7cca1c (patch) | |
| tree | fb1e81f6c430517ab5ca118104b9f0ad6875ba61 /bin | |
| parent | 492af04b6534042e2ee09b796b50508480ea04d2 (diff) | |
| download | pld-ftp-admin-ca2e224a048788c290202c040d4d7521ec7cca1c.zip pld-ftp-admin-ca2e224a048788c290202c040d4d7521ec7cca1c.tar.gz | |
LC_ALL=C for sort and uniq
Changed files:
bin/pfa-from-incoming -> 1.30
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/pfa-from-incoming | 8 |
1 files changed, 4 insertions, 4 deletions
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') |