From 69ce86ba6cde59706e431f9978fa99c74560b7d6 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Thu, 16 Nov 2017 22:50:24 +0100 Subject: bin/common-functions: one needs to give find_package_repository_to_package a git-hash for it to be useful for bin/get-package-updates --- bin/common-functions | 5 +++-- bin/get-package-updates | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'bin') diff --git a/bin/common-functions b/bin/common-functions index 8df8470..0e268be 100755 --- a/bin/common-functions +++ b/bin/common-functions @@ -730,7 +730,7 @@ find_newest_of_git_revisions() { } } -# find_package_repository_to_package $package $git_repository +# find_package_repository_to_package $package $git_repository $git_commit # find the package repository a package from a given git repository # belongs to @@ -738,13 +738,14 @@ find_package_repository_to_package() { local package="$1" local git_repository="$2" + local git_commit="$3" local repo_path local repo eval 'repo_path="${repo_paths__'"${git_repository}"'}"' repo=$( - git -C "${repo_path}" archive "$(cat "${work_dir}/${git_repository}.revision")" -- "${package}/repos" 2> /dev/null | \ + git -C "${repo_path}" archive "${git_commit}" -- "${package}/repos" 2> /dev/null | \ tar -t | \ cut -d/ -f3 | \ grep -vxF '' | \ diff --git a/bin/get-package-updates b/bin/get-package-updates index 40a5227..774223f 100755 --- a/bin/get-package-updates +++ b/bin/get-package-updates @@ -236,7 +236,7 @@ done | \ if ${found_package}; then mode='M' repository=$( - find_package_repository_to_package "${package}" "${repository}" + find_package_repository_to_package "${package}" "${repository}" "${git_revision}" ) else delete_package "${package}" -- cgit v1.2.3-70-g09d2