diff options
| author | Dave Reisner <dreisner@archlinux.org> | 2012-02-13 22:30:15 -0500 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2012-04-08 21:52:32 -0500 |
| commit | 468270ce4f3b47e93e7c25796e499dc30d3ce74a (patch) | |
| tree | 147452a14a38f6065d38856524c03a11f95c38b1 | |
| parent | 8fe67919284446a0d83755df3b7d64f54d4a4962 (diff) | |
| download | pacman-468270ce4f3b47e93e7c25796e499dc30d3ce74a.tar.xz | |
makepkg: complain when the buildfile isn't writeable
If the PKGBUILD isn't writeable for devel_update, throw a warning
instead of silently ignoring it. Some logical reordering is present in
this patch to reduce the number of nested if's.
Signed-off-by: Dave Reisner <dreisner@archlinux.org>
| -rw-r--r-- | scripts/makepkg.sh.in | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 3a689ff1..437a1929 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1820,13 +1820,13 @@ devel_update() { # ... # _foo=pkgver # - if [[ -n $newpkgver ]]; then - if [[ $newpkgver != "$pkgver" ]]; then - if [[ -f $BUILDFILE && -w $BUILDFILE ]]; then - @SEDINPLACE@ "s/^pkgver=[^ ]*/pkgver=$newpkgver/" "$BUILDFILE" - @SEDINPLACE@ "s/^pkgrel=[^ ]*/pkgrel=1/" "$BUILDFILE" - source_safe "$BUILDFILE" - fi + if [[ -n $newpkgver && $newpkgver != "$pkgver" ]]; then + if [[ -f $BUILDFILE && -w $BUILDFILE ]]; then + @SEDINPLACE@ "s/^pkgver=[^ ]*/pkgver=$newpkgver/" "$BUILDFILE" + @SEDINPLACE@ "s/^pkgrel=[^ ]*/pkgrel=1/" "$BUILDFILE" + source "$BUILDFILE" + else + warning "$(gettext "%s is not writeable -- pkgver will not be updated")" "$BUILDFILE" fi fi } |