diff options
| author | Dave Reisner <dreisner@archlinux.org> | 2014-12-19 05:20:22 +0100 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2014-12-19 05:31:01 +0100 |
| commit | 565c931e2c684d4460ff65cbec9b097ee1d8f94d (patch) | |
| tree | a42e3678e28e5aab38a41da02ea284d23c8a0453 | |
| parent | bc6ada0877010891e5c2336fd5c1242047e6a7a5 (diff) | |
| download | pacman-4.2.0.tar.gz pacman-4.2.0.tar.xz | |
updpkgsums: add more error checking before replacementv4.2.0
Re-add some paranoia which was inadvertently lost with 768b65e934. In
case 'makepkg -g' fails to generate new sums (e.g. when a remote
resource cannot be fetched), or awk fails to write the new file (i have
no idea when this would happen), bail out with an error.
Signed-off-by: Allan McRae <allan@archlinux.org>
| -rw-r--r-- | contrib/updpkgsums.sh.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/updpkgsums.sh.in b/contrib/updpkgsums.sh.in index a40845b6..b0d2d69e 100644 --- a/contrib/updpkgsums.sh.in +++ b/contrib/updpkgsums.sh.in @@ -86,7 +86,7 @@ newbuildfile=$(mktemp --tmpdir updpkgsums.XXXXXX) # $newbuildfile as garbage in $TMPDIR. This fails silently if the replacement # succeeds. trap "rm -rf '$BUILDDIR' '$newbuildfile'" EXIT -newsums=$(makepkg -g -p "$buildfile") && +newsums=$(makepkg -g -p "$buildfile") || die 'Failed to generate new checksums' awk -v newsums="$newsums" ' /^[[:blank:]]*(md|sha)[[:digit:]]+sums(_[^=]+)?=/,/\)[[:blank:]]*(#.*)?$/ { if (!w) { @@ -98,7 +98,7 @@ awk -v newsums="$newsums" ' 1 END { if (!w) print newsums } -' "$buildfile" > "$newbuildfile" +' "$buildfile" > "$newbuildfile" || die 'Failed to write new PKGBUILD' # Replace the original buildfile. if ! mv -- "$newbuildfile" "$buildfile"; then |