| 1 |
commit: 05d4eb5bf4930d032bd8bccb4838f5d0a48982d1 |
| 2 |
Author: Tim Harder <radhermit <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jan 25 09:52:35 2019 +0000 |
| 4 |
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 31 09:12:33 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05d4eb5b |
| 7 |
|
| 8 |
eclass/unpacker.eclass: localize a couple variables |
| 9 |
|
| 10 |
To avoid exporting them to the ebuild env. |
| 11 |
|
| 12 |
Signed-off-by: Tim Harder <radhermit <AT> gentoo.org> |
| 13 |
|
| 14 |
eclass/unpacker.eclass | 4 ++-- |
| 15 |
1 file changed, 2 insertions(+), 2 deletions(-) |
| 16 |
|
| 17 |
diff --git a/eclass/unpacker.eclass b/eclass/unpacker.eclass |
| 18 |
index 41aa3ef43da..370f0a9c59a 100644 |
| 19 |
--- a/eclass/unpacker.eclass |
| 20 |
+++ b/eclass/unpacker.eclass |
| 21 |
@@ -339,6 +339,7 @@ _unpacker() { |
| 22 |
a=$(find_unpackable_file "${a}") |
| 23 |
|
| 24 |
# first figure out the decompression method |
| 25 |
+ local comp="" |
| 26 |
case ${m} in |
| 27 |
*.bz2|*.tbz|*.tbz2) |
| 28 |
local bzcmd=${PORTAGE_BZIP2_COMMAND:-$(type -P pbzip2 || type -P bzip2)} |
| 29 |
@@ -353,11 +354,10 @@ _unpacker() { |
| 30 |
*.lz) |
| 31 |
: ${UNPACKER_LZIP:=$(type -P plzip || type -P pdlzip || type -P lzip)} |
| 32 |
comp="${UNPACKER_LZIP} -dc" ;; |
| 33 |
- *) comp="" ;; |
| 34 |
esac |
| 35 |
|
| 36 |
# then figure out if there are any archiving aspects |
| 37 |
- arch="" |
| 38 |
+ local arch="" |
| 39 |
case ${m} in |
| 40 |
*.tgz|*.tbz|*.tbz2|*.txz|*.tar.*|*.tar) |
| 41 |
arch="tar --no-same-owner -xof" ;; |
Archives