aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-07-27 17:38:46 +0000
committerThierry Vignaud <tv@mageia.org>2012-07-27 17:38:46 +0000
commit5c7af8b26fed67fd1410430b3715b0ff7a10852b (patch)
treeafccf9c74b45c87ccbf21c67149ddc31e7ac7ce1
parentf79304aded06a194f1cb7c630173f9d57918dca6 (diff)
downloadrpm-setup-5c7af8b26fed67fd1410430b3715b0ff7a10852b.tar
rpm-setup-5c7af8b26fed67fd1410430b3715b0ff7a10852b.tar.gz
rpm-setup-5c7af8b26fed67fd1410430b3715b0ff7a10852b.tar.bz2
rpm-setup-5c7af8b26fed67fd1410430b3715b0ff7a10852b.tar.xz
rpm-setup-5c7af8b26fed67fd1410430b3715b0ff7a10852b.zip
Make sure brp-compress doesn't go interactive in corner cases
- add --force to uncompressing so in corner cases it'll just overwrite instead of stopping to ask interactively (rpm.org, Panu Matilainen <pmatilai@redhat.com>, 2010-01-27)
-rw-r--r--NEWS1
-rwxr-xr-xbrp-compress6
2 files changed, 4 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index b474baf..b728163 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@
- sync brp-compress with upstream rpm.org:
o add *.xz and *.lzma recompress support
o avoid some unnecessary command invocations in scripts
+ o make sure brp-compress doesn't go interactive in corner cases
- sync find-debuginfo.sh with upstream rpm.org:
o add -r flag to find-debuginfo.sh to invoke eu-strip --reloc-debug-sections
(Mark Wielaard, 2011-05-25)
diff --git a/brp-compress b/brp-compress
index d8f9f03..e4da043 100755
--- a/brp-compress
+++ b/brp-compress
@@ -24,9 +24,9 @@ do
[ -f "$f" ] || continue
case "$f" in
- *.gz|*.Z) gunzip $f; b=`echo $f | sed -e 's/\.\(gz\|Z\)$//'`;;
- *.bz2) bunzip2 $f; b=`echo $f | sed -e 's/\.bz2$//'`;;
- *.xz|*.lzma) unxz $f; b=`echo $f | sed -e 's/\.\(xz\|lzma\)$//'`;;
+ *.gz|*.Z) gunzip -f $f; b=`echo $f | sed -e 's/\.\(gz\|Z\)$//'`;;
+ *.bz2) bunzip2 -f $f; b=`echo $f | sed -e 's/\.bz2$//'`;;
+ *.xz|*.lzma) unxz -f $f; b=`echo $f | sed -e 's/\.\(xz\|lzma\)$//'`;;
*) b=$f;;
esac