On Wed, Feb 15, 2012 at 6:09 AM, Allan McRae <[email protected]> wrote:
> On 15/02/12 04:58, Dave Reisner wrote: > > 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 <[email protected]> > > --- > > 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 c7bde9c..5cdf2f5 100644 > > --- a/scripts/makepkg.sh.in > > +++ b/scripts/makepkg.sh.in > > @@ -1785,13 +1785,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" && -f $BUILDFILE > ]]; then > > + if [[ -w $BUILDFILE ]]; then > > Do not change this... -f $BUILDFILE is needed as PKGBUILDs can be red > from /dev/stdin... > Yes, good catch. We should warn in that case as well. > > > + @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 > > } > > >
