obs: don't pass fetch through functions

Change-Id: I0689868db6fadaaaca470cdefbf60ceedc2eb225

4 files changed, 13 insertions, 16 deletions

diff --git a/scripts/obs/build_srcpkg.py b/scripts/obs/build_srcpkg.py
index 9163061..0ec1958 100755
--- a/scripts/obs/build_srcpkg.py
+++ b/scripts/obs/build_srcpkg.py
@@ -44,8 +44,7 @@ def main():
         lib.metapkg.build()
 
     if args.package:
-        lib.srcpkg.build(args.package,
-                         args.git_fetch, args.gerrit_id)
+        lib.srcpkg.build(args.package, args.gerrit_id)
 
 
 if __name__ == "__main__":
diff --git a/scripts/obs/lib/git.py b/scripts/obs/lib/git.py
index 13c2216..f1ee98d 100644
--- a/scripts/obs/lib/git.py
+++ b/scripts/obs/lib/git.py
@@ -22,7 +22,8 @@ def get_latest_tag_pattern(project):
     return lib.config.git_latest_tag_pattern_default
 
 
-def clone(project, fetch=False):
+def clone(project):
+    fetch = lib.args.git_fetch
     repo_path = get_repo_path(project)
     url = get_repo_url(project)
 
diff --git a/scripts/obs/lib/srcpkg.py b/scripts/obs/lib/srcpkg.py
index f1d610d..b230353 100644
--- a/scripts/obs/lib/srcpkg.py
+++ b/scripts/obs/lib/srcpkg.py
@@ -133,9 +133,9 @@ def write_commit_txt(project):
     pathlib.Path(f"{output_path}/commit_{commit}.txt").touch()
 
 
-def build(project, fetch, gerrit_id=0):
+def build(project, gerrit_id=0):
     feed = lib.args.feed
-    lib.git.clone(project, fetch)
+    lib.git.clone(project)
     lib.git.clean(project)
     if gerrit_id > 0:
         lib.git.checkout_from_review(project, gerrit_id)
diff --git a/scripts/obs/update_obs_project.py b/scripts/obs/update_obs_project.py
index 155caee..93f2f7c 100755
--- a/scripts/obs/update_obs_project.py
+++ b/scripts/obs/update_obs_project.py
@@ -32,7 +32,7 @@ def parse_packages(packages_arg):
     return ret
 
 
-def build_srcpkg(package, fetch, is_meta_pkg):
+def build_srcpkg(package, is_meta_pkg):
     global srcpkgs_built
     global srcpkgs_failed_build
 
@@ -42,7 +42,7 @@ def build_srcpkg(package, fetch, is_meta_pkg):
         if is_meta_pkg:
             version = lib.metapkg.build()
         else:
-            version = lib.srcpkg.build(package, fetch)
+            version = lib.srcpkg.build(package)
         srcpkgs_built[package] = version
     except Exception as ex:
         traceback.print_exception(type(ex), ex, ex.__traceback__)
@@ -62,8 +62,7 @@ def is_up_to_date(obs_version, git_latest_version):
     return False
 
 
-def build_srcpkg_if_needed(pkgs_remote, package,
-                           fetch, is_meta_pkg, skip_up_to_date):
+def build_srcpkg_if_needed(pkgs_remote, package, is_meta_pkg, skip_up_to_date):
     global srcpkgs_skipped
     feed = lib.args.feed
     branch = lib.args.git_branch
@@ -104,7 +103,7 @@ def build_srcpkg_if_needed(pkgs_remote, package,
     else:
         print(f"{package}: building source package (feed is {feed})")
 
-    build_srcpkg(package, fetch, is_meta_pkg)
+    build_srcpkg(package, is_meta_pkg)
 
 
 def upload_srcpkg(pkgs_remote, package, version):
@@ -113,8 +112,7 @@ def upload_srcpkg(pkgs_remote, package, version):
     lib.osc.update_package(package, version)
 
 
-def build_srcpkgs(pkgs_remote, packages, fetch,
-                  meta, skip_up_to_date):
+def build_srcpkgs(pkgs_remote, packages, meta, skip_up_to_date):
     print()
     print("### Building source packages ###")
     print()
@@ -122,11 +120,11 @@ def build_srcpkgs(pkgs_remote, packages, fetch,
     if meta:
         feed = lib.args.feed
         build_srcpkg_if_needed(pkgs_remote, f"osmocom-{feed}",
-                               fetch, True, skip_up_to_date)
+                               True, skip_up_to_date)
 
     for package in packages:
         build_srcpkg_if_needed(pkgs_remote, package,
-                               fetch, False, skip_up_to_date)
+                               False, skip_up_to_date)
 
 
 def upload_srcpkgs(pkgs_remote):
@@ -216,8 +214,7 @@ def main():
 
     pkgs_remote = lib.osc.get_remote_pkgs()
 
-    build_srcpkgs(pkgs_remote, packages,
-                  args.git_fetch, args.meta, args.skip_up_to_date)
+    build_srcpkgs(pkgs_remote, packages, args.meta, args.skip_up_to_date)
     upload_srcpkgs(pkgs_remote)
     exit_with_summary()