1
0
forked from mirrors/pacman

Compare commits

...

4 Commits

Author SHA1 Message Date
Ivy Foster
b543c055b9 Make get_pkg_arch treat arch as an array
We use the get_pkg_arch function with the package name parameter in two places:
1) checking if the package is already built
2) installing build packages

Currently this failed when a package override for "arch" was an array, despite
all our documentation stating that it is indeed an array.  This change makes
these two places fail if there is package override for arch that is not an
array - i.e. of the form arch='i686'.

Signed-off-by: Ivy Foster <joyfulgirl@archlinux.us>
Signed-off-by: Allan McRae <allan@archlinux.org>
2015-03-26 14:42:22 +10:00
Allan McRae
b8f2d713e0 Update PKGBUILD-split.proto allowed overrides
Commit 8a02abcf19 disallowed overridding pkgver/pkgrel/epoch.  Update the
split package prototype to refelct this change.

Signed-off-by: Allan McRae <allan@archlinux.org>
2015-03-26 14:42:10 +10:00
Christian Hesse
eb21e9eb93 fix source package signing with SRCPKGDIR set
Signed-off-by: Christian Hesse <mail@eworm.de>
Signed-off-by: Allan McRae <allan@archlinux.org>
2015-03-26 14:41:26 +10:00
Allan McRae
92b8c09000 Update release history
Signed-off-by: Allan McRae <allan@archlinux.org>
2015-03-02 01:36:33 +10:00
3 changed files with 5 additions and 6 deletions

View File

@@ -71,6 +71,8 @@ Releases
[frame="topbot",grid="none",options="header,autowidth"]
!======
!Version !Date
!4.2.1 !2015-02-20
!4.2.0 !2014-12-19
!4.1.2 !2013-06-18
!4.1.1 !2013-05-07
!4.1.0 !2013-04-01

View File

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

View File

@@ -902,7 +902,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"
@@ -2393,8 +2393,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