diff options
Diffstat (limited to 'bin/pfa-from-incoming')
| -rwxr-xr-x | 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 1696bf6..0023261 100755 --- a/bin/pfa-from-incoming +++ b/bin/pfa-from-incoming @@ -97,7 +97,7 @@ Subject: %s sm.close() def move_noarch(f, arch, rpmfile, dstpkg): - if dstpkg.noarch_arch.has_key(rpmfile): + if rpmfile in dstpkg.noarch_arch: os.system("LC_ALL=C rpm -qlp %s | LC_ALL=C sort > %s/files.new" % (incoming_dir + arch + '/' + rpmfile, tmpdir)) os.system("rpm -qRp %s | LC_ALL=C sort | LC_ALL=C uniq > %s/reqs.new" % @@ -122,7 +122,7 @@ 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)) - if not dstpkg.files.has_key(arch): + if arch not in dstpkg.files: f.write("file:noarch:%s\ninfo:noarch_arch:%s:%s\n" % (rpmfile, rpmfile, arch)) mv(incoming_dir + arch + '/' + rpmfile, default_to + 'noarch/RPMS') @@ -230,7 +230,7 @@ for arch in ftp_archs: dstpkg = BasePkg(`srcpkg`, ftptree) - if dstpkg.files.has_key(arch): + if arch in dstpkg.files: ftpio.log("files from %s for arch %s already present in %s; removing older files" % (`srcpkg`, arch, ftptree)) for rpmfile in dstpkg.files[arch]: if is_debuginfo(rpmfile): @@ -256,7 +256,7 @@ for arch in ftp_archs: if rpmfile[-11:] == '.noarch.rpm' and config.separate_noarch: move_noarch(f, arch, rpmfile, dstpkg) else: - if not dstpkg.files.has_key(arch): + if arch not in dstpkg.files: f.write("file:%s:%s\n" % (arch, rpmfile)) srcfile = incoming_dir + arch + '/' + rpmfile |