Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/dbapi/
Date: Sat, 21 May 2011 14:23:45
Message-Id: fcd742f219611c4f80bf4f24c198890f8a44f85f.zmedico@gentoo
1 commit: fcd742f219611c4f80bf4f24c198890f8a44f85f
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Sat May 21 14:22:00 2011 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Sat May 21 14:22:00 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=fcd742f2
7
8 treewalk: force AUTOCLEAN=yes if libs preserved
9
10 ---
11 pym/portage/dbapi/vartree.py | 7 ++++++-
12 1 files changed, 6 insertions(+), 1 deletions(-)
13
14 diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
15 index 60d52a8..f53c209 100644
16 --- a/pym/portage/dbapi/vartree.py
17 +++ b/pym/portage/dbapi/vartree.py
18 @@ -3443,7 +3443,12 @@ class dblink(object):
19 else:
20 emerge_log = scheduler.dblinkEmergeLog
21
22 - autoclean = self.settings.get("AUTOCLEAN", "yes") == "yes"
23 + # If we have any preserved libraries then autoclean
24 + # is forced so that preserve-libs logic doesn't have
25 + # to account for the additional complexity of the
26 + # AUTOCLEAN=no mode.
27 + autoclean = self.settings.get("AUTOCLEAN", "yes") == "yes" \
28 + or preserve_paths
29
30 if autoclean:
31 emerge_log(_(" >>> AUTOCLEAN: %s") % (slot_atom,))