diff options
| author | Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org> | 2012-10-18 00:41:38 +0200 |
|---|---|---|
| committer | Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org> | 2012-10-18 00:41:38 +0200 |
| commit | e72d8353f7a9493e0508c367e416423b52ea22ce (patch) | |
| tree | f5857416b5a99624a2b879a2c92adf00e072b1e9 /bin/phase-helpers.sh | |
| parent | fdb856ae456a559fa74066704cd19858d317ed33 (diff) | |
| download | portage-e72d8353f7a9493e0508c367e416423b52ea22ce.tar.gz portage-e72d8353f7a9493e0508c367e416423b52ea22ce.tar.bz2 portage-e72d8353f7a9493e0508c367e416423b52ea22ce.zip | |
Make keepdir() compatible with subslots.
Diffstat (limited to 'bin/phase-helpers.sh')
| -rw-r--r-- | bin/phase-helpers.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh index 67d09a462..5055060f7 100644 --- a/bin/phase-helpers.sh +++ b/bin/phase-helpers.sh @@ -150,7 +150,7 @@ keepdir() { fi if [ "$1" == "-R" ] || [ "$1" == "-r" ]; then shift - find "$@" -type d -printf "${ED}%p/.keep_${CATEGORY}_${PN}-${SLOT}\n" \ + find "$@" -type d -printf "${ED}%p/.keep_${CATEGORY}_${PN}-${SLOT%/*}\n" \ | tr "\n" "\0" | \ while read -r -d $'\0' ; do >> "$REPLY" || \ @@ -158,7 +158,7 @@ keepdir() { done else for x in "$@"; do - >> "${ED}${x}/.keep_${CATEGORY}_${PN}-${SLOT}" || \ + >> "${ED}${x}/.keep_${CATEGORY}_${PN}-${SLOT%/*}" || \ die "Failed to create .keep in ${ED}${x}" done fi |