[projects/pld-ftp-admin] Don't write duplicate entries to package .info

[baggins]

commit c0d14f9dbb8531d7af2b5c136535f4e1ff669e39
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Thu Oct 23 20:52:11 2014 +0200

    Don't write duplicate entries to package .info

 bin/pfa-from-incoming | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/bin/pfa-from-incoming b/bin/pfa-from-incoming
index 4b86b2b..6523ea1 100755
--- a/bin/pfa-from-incoming
+++ b/bin/pfa-from-incoming
@@ -120,7 +120,8 @@ def move_noarch(f, arch, rpmfile, dstpkg):
                   (incoming_dir + arch + '/' + rpmfile, noarchcachedir, rpmfile))
         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))
+        if not dstpkg.files.has_key(arch):
+            f.write("file:noarch:%s\ninfo:noarch_arch:%s:%s\n" % (rpmfile, rpmfile, arch))
         mv(incoming_dir + arch + '/' + rpmfile, default_to + 'noarch/RPMS')
 
 def send_vr_msg(snvr, anvr, pkg, arch):
@@ -253,7 +254,8 @@ for arch in ftp_archs:
             if rpmfile[-11:] == '.noarch.rpm' and config.separate_noarch:
                 move_noarch(f, arch, rpmfile, dstpkg)
             else:
-                f.write("file:%s:%s\n" % (arch, rpmfile))
+                if not dstpkg.files.has_key(arch):
+                    f.write("file:%s:%s\n" % (arch, rpmfile))
                 srcfile = incoming_dir + arch + '/' + rpmfile
 
                 if is_debuginfo(rpmfile):
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/projects/pld-ftp-admin.git/commitdiff/c0d14f9dbb8531d7af2b5c136535f4e1ff669e39