diff options
-rwxr-xr-x | bin/pfa-from-incoming | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/bin/pfa-from-incoming b/bin/pfa-from-incoming index 0fbbf4a..27bee30 100755 --- a/bin/pfa-from-incoming +++ b/bin/pfa-from-incoming @@ -79,7 +79,7 @@ Subject: %s if files_differ: f=open("%s/files.diff" % tmpdir, 'r') sm.write("Difference between %s (currently in %s) and %s FILES\n" % - (pkg.noarch_arch[rpmfile], `ftptree`, arch)), + (pkg.noarch_arch[rpmfile], repr(ftptree), arch)), for line in f.readlines(True)[2:]: sm.write(line) f.close() @@ -89,7 +89,7 @@ Subject: %s if reqs_differ: f=open("%s/reqs.diff" % tmpdir, 'r') sm.write("Difference between %s (currently in %s) and %s REQS\n" % - (pkg.noarch_arch[rpmfile], `ftptree`, arch)), + (pkg.noarch_arch[rpmfile], repr(ftptree), arch)), for line in f.readlines(True)[2:]: sm.write(line) f.close() @@ -155,7 +155,7 @@ Subject: %s sm.write(msg) sm.write("Difference between %s SRPM (currently in %s) and %s RPM NVR:\n\n" % - (snvr[0], `ftptree`, arch)), + (snvr[0], repr(ftptree), arch)), sm.write("Expected (%s):\nV: %s\nR: %s\n\n" % snvr) sm.write("RPM:\nN: %s\nV: %s\nR: %s\n" % anvr) sm.write('\n') @@ -228,10 +228,10 @@ for arch in ftp_archs: ftpio.log("%s file missing; skipping move until next round" % (filem)) continue - dstpkg = BasePkg(`srcpkg`, ftptree) + dstpkg = BasePkg(repr(srcpkg), ftptree) if arch in dstpkg.files: - ftpio.log("files from %s for arch %s already present in %s; removing older files" % (`srcpkg`, arch, ftptree)) + ftpio.log("files from %s for arch %s already present in %s; removing older files" % (repr(srcpkg), arch, ftptree)) for rpmfile in dstpkg.files[arch]: if is_debuginfo(rpmfile): dstfile = default_to + arch + '/debuginfo' |