Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2017-11-16 22:50:24 +0100
committerErich Eckner <git@eckner.net>2017-11-16 22:50:24 +0100
commit69ce86ba6cde59706e431f9978fa99c74560b7d6 (patch)
treedb5b32628772ef6c3f3470568b0b91aead368997
parent4c8ea425567ea60311d81e2a165ccf03d768710d (diff)
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
-rwxr-xr-xbin/common-functions5
-rwxr-xr-xbin/get-package-updates2
2 files changed, 4 insertions, 3 deletions
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}"