moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-12-22 15:58:50 -05:00
Code Issues Releases Wiki Activity

Merge branch 'maint'

Browse Source
This commit is contained in:
Allan McRae 2014-12-27 17:07:04 +10:00
commit 25b492aab6
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libalpm/package.c
View File

@ -584,7 +584,7 @@ int _alpm_pkg_dup(alpm_pkg_t *pkg, alpm_pkg_t **new_ptr)
newpkg->installdate = pkg->installdate; newpkg->installdate = pkg->installdate;
STRDUP(newpkg->packager, pkg->packager, goto cleanup); STRDUP(newpkg->packager, pkg->packager, goto cleanup);
STRDUP(newpkg->md5sum, pkg->md5sum, 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); STRDUP(newpkg->arch, pkg->arch, goto cleanup);
newpkg->size = pkg->size; newpkg->size = pkg->size;
newpkg->isize = pkg->isize; newpkg->isize = pkg->isize;

2
scripts/makepkg.sh.in
View File

@ -2925,7 +2925,7 @@ check_vcs_software() {
uninstalled="$(set +E; check_deps $client)" || exit 1 uninstalled="$(set +E; check_deps $client)" || exit 1
# if not installed, check presence in depends or makedepends # if not installed, check presence in depends or makedepends
if [[ -n "$uninstalled" ]] && (( ! NODEPS || ( VERIFYSOURCE && !DEP_BIN ) )); then 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.")" \ error "$(gettext "Cannot find the %s package needed to handle %s sources.")" \
"$client" "${proto%%+*}" "$client" "${proto%%+*}"
ret=1 ret=1