summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNezmer <Nezmer@allurelinux.org>2009-12-12 00:25:32 +0100
committerDan McGee <dan@archlinux.org>2009-12-14 06:30:58 +0100
commit9fe27b068ae40a407fd5dd12f974d84499d41ef0 (patch)
tree9b13f7a9751c4ac259100f333d68447da2ebc648
parent05ff276eefc51eeeee58832accd8398eac047037 (diff)
downloadpacman-9fe27b068ae40a407fd5dd12f974d84499d41ef0.tar.gz
pacman-9fe27b068ae40a407fd5dd12f974d84499d41ef0.tar.xz
makepkg: skip devel_check() when repackaging
Currently, "makepkg -R" creates a package with a wrong updated $pkgver. Signed-off-by: Nezmer <Nezmer@allurelinux.org> [Allan: adjusted comment] Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--scripts/makepkg.sh.in6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index cbb1077f..40283fe2 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -1268,9 +1268,9 @@ check_sanity() {
devel_check() {
newpkgver=""
- # Do not update pkgver if --holdver is set, when building a source package,
- # when reading PKGBUILD from pipe (-f), or if we cannot write to the file (-w)
- if (( HOLDVER || SOURCEONLY )) \
+ # Do not update pkgver if --holdver is set, when building a source package, repackaging,
+ # reading PKGBUILD from pipe (-f), or if we cannot write to the file (-w)
+ if (( HOLDVER || SOURCEONLY || REPKG )) \
|| [[ ! -f $BUILDFILE || ! -w $BUILDFILE ]]; then
return
fi