moparisthebest
/
pacman
mirror of https://github.com/moparisthebest/pacman
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Allan McRae 2015-03-26 14:43:13 +10:00
parent f34e48a988 b543c055b9
commit e7e0c13762
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
proto/PKGBUILD-split.proto
View File

@ -49,9 +49,6 @@ check() {
package_pkg1() {
# options and directives that can be overridden
pkgver=
pkgrel=
epoch=
pkgdesc=""
arch=()
url=""

6
scripts/makepkg.sh.in
View File

@ -879,7 +879,7 @@ get_pkg_arch() {
fi
else
local arch_override
pkgbuild_get_attribute "$1" arch 0 arch_override
pkgbuild_get_attribute "$1" arch 1 arch_override
(( ${#arch_override[@]} == 0 )) && arch_override=("${arch[@]}")
if [[ $arch_override = "any" ]]; then
printf "%s\n" "any"
@ -2106,8 +2106,8 @@ create_srcpackage() {
ln -s "${pkg_file}" "${pkg_file/$SRCPKGDEST/$startdir}"
ret=$?
if [[ -f $pkg_file.sig ]]; then
rm -f "${pkg_file/$PKGDEST/$startdir}.sig"
ln -s "$pkg_file.sig" "${pkg_file/$PKGDEST/$startdir}.sig"
rm -f "${pkg_file/$SRCPKGDEST/$startdir}.sig"
ln -s "$pkg_file.sig" "${pkg_file/$SRCPKGDEST/$startdir}.sig"
fi
fi