Djam/r11-builder-agent
1
0
Fork 0
mirror of https://tvoygit.ru/Djam/r11-builder-agent.git synced 2025-02-23 10:22:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove python2isms

Browse source
This commit is contained in:
Alexander Stefanov 2019-04-12 00:33:38 +03:00
parent d12b431678
commit 1e95b63215
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
build-rpm.sh
View file

@ -186,7 +186,6 @@ probe_cpu
} }
test_rpm() { test_rpm() {
set -x
# Rerun tests # Rerun tests
PACKAGES=${packages} \ PACKAGES=${packages} \
chroot_path="$($MOCK_BIN --configdir=$config_dir --print-root-path)" \ chroot_path="$($MOCK_BIN --configdir=$config_dir --print-root-path)" \

6
check_newer_versions.py
View file

@ -53,7 +53,7 @@ for pkg in glob.glob(chroot_path + "/*.rpm"):
p = os.popen("sudo chroot " + chroot_path + " urpmq --wget --wget-options --auth-no-challenge --evrd " + name + " 2>&1 | sed 's/|/\\n/g'") p = os.popen("sudo chroot " + chroot_path + " urpmq --wget --wget-options --auth-no-challenge --evrd " + name + " 2>&1 | sed 's/|/\\n/g'")
for existing_pkg in p.readlines(): for existing_pkg in p.readlines():
if "Unknown option:" in existing_pkg: if "Unknown option:" in existing_pkg:
print "This urpmq doesn't support --evrd option, the test will be skipped" print("This urpmq doesn't support --evrd option, the test will be skipped")
sys.exit(0) sys.exit(0)
# existing_pkg should look like "name: epoch:version-release:distepoch" # existing_pkg should look like "name: epoch:version-release:distepoch"
@ -65,12 +65,12 @@ for pkg in glob.glob(chroot_path + "/*.rpm"):
(ex_version, ex_release) = evrd_array[1].split("-") (ex_version, ex_release) = evrd_array[1].split("-")
except: except:
# urpmq output line is not recognized - just print it "as is" # urpmq output line is not recognized - just print it "as is"
print existing_pkg print(existing_pkg)
continue continue
res = rpm5utils.miscutils.compareDEVR( (distepoch, epoch, version, release), (ex_distepoch, ex_epoch, ex_version, ex_release) ) res = rpm5utils.miscutils.compareDEVR( (distepoch, epoch, version, release), (ex_distepoch, ex_epoch, ex_version, ex_release) )
if res < 1: if res < 1:
print "A package with the same name (" + name + ") and same or newer version (" + evrd + ") already exists in repositories!" print(("A package with the same name (" + name + ") and same or newer version (" + evrd + ") already exists in repositories!"))
exit_code = 1 exit_code = 1
# Matching package has been found - no need to parse other lines of "urpmq --evrd" # Matching package has been found - no need to parse other lines of "urpmq --evrd"
break break