osmith has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ci/+/31933 )
Change subject: obs: don't pass skip_up_to_date through functions
......................................................................
obs: don't pass skip_up_to_date through functions
Change-Id: Ide0c1f5452f5ce965541b45039345abc52b3d140
---
M scripts/obs/update_obs_project.py
1 file changed, 15 insertions(+), 8 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/33/31933/1
diff --git a/scripts/obs/update_obs_project.py
b/scripts/obs/update_obs_project.py
index 867198d..24dba8f 100755
--- a/scripts/obs/update_obs_project.py
+++ b/scripts/obs/update_obs_project.py
@@ -62,7 +62,7 @@
return False
-def build_srcpkg_if_needed(pkgs_remote, package, is_meta_pkg, skip_up_to_date):
+def build_srcpkg_if_needed(pkgs_remote, package, is_meta_pkg):
global srcpkgs_skipped
feed = lib.args.feed
branch = lib.args.git_branch
@@ -89,7 +89,7 @@
else:
obs_version = lib.osc.get_package_version(package)
if is_up_to_date(obs_version, latest_version):
- if skip_up_to_date:
+ if lib.args.skip_up_to_date:
print(f"{package}: skipping ({obs_version} is up-to-date)")
srcpkgs_skipped += [package]
return
@@ -112,19 +112,17 @@
lib.osc.update_package(package, version)
-def build_srcpkgs(pkgs_remote, packages, skip_up_to_date):
+def build_srcpkgs(pkgs_remote, packages):
print()
print("### Building source packages ###")
print()
if lib.args.meta:
feed = lib.args.feed
- build_srcpkg_if_needed(pkgs_remote, f"osmocom-{feed}",
- True, skip_up_to_date)
+ build_srcpkg_if_needed(pkgs_remote, f"osmocom-{feed}", True)
for package in packages:
- build_srcpkg_if_needed(pkgs_remote, package,
- False, skip_up_to_date)
+ build_srcpkg_if_needed(pkgs_remote, package, False)
def upload_srcpkgs(pkgs_remote):
@@ -214,7 +212,7 @@
pkgs_remote = lib.osc.get_remote_pkgs()
- build_srcpkgs(pkgs_remote, packages, args.skip_up_to_date)
+ build_srcpkgs(pkgs_remote, packages)
upload_srcpkgs(pkgs_remote)
exit_with_summary()
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/31933
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: Ide0c1f5452f5ce965541b45039345abc52b3d140
Gerrit-Change-Number: 31933
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <[email protected]>
Gerrit-MessageType: newchange
