1 |
commit: 9b2e4d5a48e17ae1a637c6de7a311cd9055dd02e |
2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jun 2 04:06:14 2012 +0000 |
4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jun 2 04:06:14 2012 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=9b2e4d5a |
7 |
|
8 |
ecompressdir: fix brokenlink newdest logic |
9 |
|
10 |
Was broken in commit bbacf8674168cf033de0ccb161f568d0b26f032b. |
11 |
|
12 |
--- |
13 |
bin/ebuild-helpers/ecompressdir | 6 +++++- |
14 |
1 files changed, 5 insertions(+), 1 deletions(-) |
15 |
|
16 |
diff --git a/bin/ebuild-helpers/ecompressdir b/bin/ebuild-helpers/ecompressdir |
17 |
index c77d998..6801a07 100755 |
18 |
--- a/bin/ebuild-helpers/ecompressdir |
19 |
+++ b/bin/ebuild-helpers/ecompressdir |
20 |
@@ -86,7 +86,11 @@ funk_up_dir() { |
21 |
[[ ${olddest} == *${suffix} ]] || continue |
22 |
newdest=${olddest%${suffix}} |
23 |
fi |
24 |
- [[ -f ${newdest} ]] || continue |
25 |
+ if [[ "${newdest}" == /* ]] ; then |
26 |
+ [[ -f "${D}${newdest}" ]] || continue |
27 |
+ else |
28 |
+ [[ -f "${dir}/${brokenlink%/*}/${newdest}" ]] || continue |
29 |
+ fi |
30 |
rm -f "${brokenlink}" |
31 |
[[ ${act} == "compress" ]] \ |
32 |
&& ln -snf "${newdest}" "${brokenlink}${suffix}" \ |