From 286dc83451fe816b80a00806a7f15566ffcc23a7 Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Wed, 24 Dec 2014 11:57:21 -0500 Subject: makepkg: fix typo in dep array name We fixed this up to check architecture specific sources in ec679e09b2, but fudged the array name in the in_array call. Signed-off-by: Allan McRae --- scripts/makepkg.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index d53c39f2..ab4a784b 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2925,7 +2925,7 @@ check_vcs_software() { uninstalled="$(set +E; check_deps $client)" || exit 1 # if not installed, check presence in depends or makedepends if [[ -n "$uninstalled" ]] && (( ! NODEPS || ( VERIFYSOURCE && !DEP_BIN ) )); then - if ! in_array "$client" ${alldeps[@]}; then + if ! in_array "$client" ${all_deps[@]}; then error "$(gettext "Cannot find the %s package needed to handle %s sources.")" \ "$client" "${proto%%+*}" ret=1 -- cgit v1.2.3-54-g00ecf From 5221440b6bd0520762026a24abdde50d60552f99 Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Wed, 24 Dec 2014 12:36:43 +1000 Subject: fix duplication of package sha256sum Signed-off-by: Allan McRae --- lib/libalpm/package.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index e2997f69..d9ed3d31 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -574,7 +574,7 @@ int _alpm_pkg_dup(alpm_pkg_t *pkg, alpm_pkg_t **new_ptr) newpkg->installdate = pkg->installdate; STRDUP(newpkg->packager, pkg->packager, goto cleanup); STRDUP(newpkg->md5sum, pkg->md5sum, goto cleanup); - STRDUP(newpkg->sha256sum, pkg->md5sum, goto cleanup); + STRDUP(newpkg->sha256sum, pkg->sha256sum, goto cleanup); STRDUP(newpkg->arch, pkg->arch, goto cleanup); newpkg->size = pkg->size; newpkg->isize = pkg->isize; -- cgit v1.2.3-54-g00ecf