summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllan McRae <allan@archlinux.org>2015-03-26 14:43:13 +1000
committerAllan McRae <allan@archlinux.org>2015-03-26 14:43:13 +1000
commite7e0c137623253c6f1bad0c89e36586713eee526 (patch)
tree881935da526c3175b2b24191f2bc61a2029615a6
parentf34e48a9886150147da4864230b6804d6f6ccc58 (diff)
parentb543c055b9607161e6bd47b9d3709243057c8771 (diff)
downloadpacman-e7e0c137623253c6f1bad0c89e36586713eee526.tar.xz
Merge branch 'maint'
-rw-r--r--proto/PKGBUILD-split.proto3
-rw-r--r--scripts/makepkg.sh.in6
2 files changed, 3 insertions, 6 deletions
diff --git a/proto/PKGBUILD-split.proto b/proto/PKGBUILD-split.proto
index 6dae704b..9898ef81 100644
--- a/proto/PKGBUILD-split.proto
+++ b/proto/PKGBUILD-split.proto
@@ -49,9 +49,6 @@ check() {
package_pkg1() {
# options and directives that can be overridden
- pkgver=
- pkgrel=
- epoch=
pkgdesc=""
arch=()
url=""
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 168f3348..acee796e 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -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