bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'maint'

Browse source
This commit is contained in:
Allan McRae 2015-03-26 14:43:13 +10:00
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() { package_pkg1() {
# options and directives that can be overridden # options and directives that can be overridden
pkgver=
pkgrel=
epoch=
pkgdesc="" pkgdesc=""
arch=() arch=()
url="" url=""

6
scripts/makepkg.sh.in
View file

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