summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2024-07-03 16:01:03 +0200
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2024-07-22 11:38:08 +0200
commit82c459f910c3036b22c9f41472b622ef4bfdab1d (patch)
treecabf3f364939d2dbd364311b5e04005e483bbcbd /tools
parentzsh/_networkctl: remove duplicated argument for completion (#31926) (diff)
downloadsystemd-82c459f910c3036b22c9f41472b622ef4bfdab1d.tar.xz
systemd-82c459f910c3036b22c9f41472b622ef4bfdab1d.zip
tools/update-distro-hash: rename, fetch the repository if appropriate
Let's rename the tool to tools/fetch-distro. It's useful to be able to fetch the distro directly. But when that functionality is added, the old name is confusing. Now --update/-u must be specified to update the commits. --reference-if-able is used to speed up the clone of debian. It saves about 75% of the download.
Diffstat (limited to 'tools')
-rwxr-xr-xtools/fetch-distro.py (renamed from tools/update-distro-hash.py)41
1 files changed, 36 insertions, 5 deletions
diff --git a/tools/update-distro-hash.py b/tools/fetch-distro.py
index 6f2d37f72e..dacaf28bca 100755
--- a/tools/update-distro-hash.py
+++ b/tools/fetch-distro.py
@@ -2,7 +2,8 @@
# SPDX-License-Identifier: LGPL-2.1-or-later
"""
-Fetch commits for pkg/{distribution} and, if changed, commit the latest hash.
+Check out pkg/{distribution}.
+With -u, fetch commits, and if changed, commit the latest hash.
"""
import argparse
@@ -25,6 +26,11 @@ def parse_args():
action='store_false',
default=True,
)
+ p.add_argument(
+ '--update', '-u',
+ action='store_true',
+ default=False,
+ )
return p.parse_args()
def read_config(distro: str):
@@ -46,12 +52,33 @@ def commit_file(distro: str, file: Path, commit: str, changes: str):
print(f"+ {shlex.join(cmd)}")
subprocess.check_call(cmd)
-def update_distro(args, distro: str):
- cmd = ['git', '-C', f'pkg/{distro}', 'fetch']
+def checkout_distro(args, distro: str, config: dict):
+ dest = Path(f'pkg/{distro}')
+ if dest.exists():
+ print(f'{dest} already exists.')
+ return
+
+ url = config['Environment']['GIT_URL']
+ branch = config['Environment']['GIT_BRANCH']
+
+ # Only debian uses source-git for now…
+ reference = [f'--reference-if-able=.'] if distro == 'debian' else []
+
+ cmd = [
+ 'git', 'clone', url,
+ f'--branch={branch}',
+ dest.as_posix(),
+ *reference,
+ ]
print(f"+ {shlex.join(cmd)}")
subprocess.check_call(cmd)
- config = read_config(distro)
+ args.fetch = False # no need to fetch if we just cloned
+
+def update_distro(args, distro: str, config: dict):
+ cmd = ['git', '-C', f'pkg/{distro}', 'fetch']
+ print(f"+ {shlex.join(cmd)}")
+ subprocess.check_call(cmd)
branch = config['Environment']['GIT_BRANCH']
old_commit = config['Environment']['GIT_COMMIT']
@@ -86,5 +113,9 @@ def update_distro(args, distro: str):
if __name__ == '__main__':
args = parse_args()
+
for distro in args.distribution:
- update_distro(args, distro)
+ config = read_config(distro)
+ checkout_distro(args, distro, config)
+ if args.update:
+ update_distro(args, distro, config)