diff options
| author | Allan McRae <allan@archlinux.org> | 2014-12-27 17:07:04 +1000 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2014-12-27 17:07:04 +1000 |
| commit | 25b492aab691579c8edfc9f57831d055a3f82d74 (patch) | |
| tree | a0cacc788dc2105aeb8b1acb8c757e010402bf4c | |
| parent | 1f1e53c208cfa0e284511470acb679fe10c4d80c (diff) | |
| parent | 5221440b6bd0520762026a24abdde50d60552f99 (diff) | |
| download | pacman-25b492aab691579c8edfc9f57831d055a3f82d74.tar.xz | |
Merge branch 'maint'
| -rw-r--r-- | lib/libalpm/package.c | 2 | ||||
| -rw-r--r-- | scripts/makepkg.sh.in | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index ce6b0a21..b186a4cb 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -584,7 +584,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; 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 |