summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Harder <radhermit@gentoo.org>2019-01-25 03:52:35 -0600
committerTim Harder <radhermit@gentoo.org>2019-01-31 03:12:33 -0600
commit05d4eb5bf4930d032bd8bccb4838f5d0a48982d1 (patch)
treef201b4382bede6f9e832b3ae0c374242c4db2ea5
parentapp-admin/conky-1.10.8-r4: alpha stable (diff)
downloadgentoo-05d4eb5bf4930d032bd8bccb4838f5d0a48982d1.tar.gz
gentoo-05d4eb5bf4930d032bd8bccb4838f5d0a48982d1.tar.bz2
gentoo-05d4eb5bf4930d032bd8bccb4838f5d0a48982d1.zip
eclass/unpacker.eclass: localize a couple variables
To avoid exporting them to the ebuild env. Signed-off-by: Tim Harder <radhermit@gentoo.org>
-rw-r--r--eclass/unpacker.eclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/eclass/unpacker.eclass b/eclass/unpacker.eclass
index 41aa3ef43da..370f0a9c59a 100644
--- a/eclass/unpacker.eclass
+++ b/eclass/unpacker.eclass
@@ -339,6 +339,7 @@ _unpacker() {
a=$(find_unpackable_file "${a}")
# first figure out the decompression method
+ local comp=""
case ${m} in
*.bz2|*.tbz|*.tbz2)
local bzcmd=${PORTAGE_BZIP2_COMMAND:-$(type -P pbzip2 || type -P bzip2)}
@@ -353,11 +354,10 @@ _unpacker() {
*.lz)
: ${UNPACKER_LZIP:=$(type -P plzip || type -P pdlzip || type -P lzip)}
comp="${UNPACKER_LZIP} -dc" ;;
- *) comp="" ;;
esac
# then figure out if there are any archiving aspects
- arch=""
+ local arch=""
case ${m} in
*.tgz|*.tbz|*.tbz2|*.txz|*.tar.*|*.tar)
arch="tar --no-same-owner -xof" ;;