projects
/
portage.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8a4d81e
)
Don't warn about /etc/make.profile not being a symlink if it has a parent file.
author
Zac Medico
<zmedico@gentoo.org>
Sun, 14 Jan 2007 22:03:17 +0000
(22:03 -0000)
committer
Zac Medico
<zmedico@gentoo.org>
Sun, 14 Jan 2007 22:03:17 +0000
(22:03 -0000)
svn path=/main/trunk/; revision=5647
pym/portage.py
patch
|
blob
|
history
diff --git
a/pym/portage.py
b/pym/portage.py
index 681fb8d0f7fcdfded2a30878047ee0e3894a83ef..76a77e38e4d81589a7328644ae99b438b39a74fc 100644
(file)
--- a/
pym/portage.py
+++ b/
pym/portage.py
@@
-1513,6
+1513,7
@@
class config:
abs_profile_path = os.path.join(self["PORTAGE_CONFIGROOT"],
PROFILE_PATH.lstrip(os.path.sep))
if not os.path.islink(abs_profile_path) and \
+ not os.path.exists(os.path.join(abs_profile_path, "parent")) and \
os.path.exists(os.path.join(self["PORTDIR"], "profiles")):
writemsg("\a\n\n!!! %s is not a symlink and will probably prevent most merges.\n" % abs_profile_path,
noiselevel=-1)