summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Dolbec <dolsen@gentoo.org>2012-11-18 11:08:26 -0800
committerBrian Dolbec <dolsen@gentoo.org>2012-11-18 11:08:26 -0800
commit79c6f8fd75d87831023d0785f4f24ca490cc92af (patch)
tree719d98f6a13532eff1e1326c666138e04cbc033e
parent60f1fa4b722a79cf86c6a0940a9df218d57787b3 (diff)
downloadlayman-79c6f8fd75d87831023d0785f4f24ca490cc92af.tar.gz
layman-79c6f8fd75d87831023d0785f4f24ca490cc92af.tar.bz2
layman-79c6f8fd75d87831023d0785f4f24ca490cc92af.zip
add auto detection for make.conf location
-rw-r--r--layman/updater.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/layman/updater.py b/layman/updater.py
index ba9a1b8..b9b72bc 100644
--- a/layman/updater.py
+++ b/layman/updater.py
@@ -113,6 +113,9 @@ class Main(object):
def print_instructions(self):
+ make_conf = '/etc/portage/make.conf'
+ if not os.access(make_conf, os.F_OK):
+ make_conf = '/etc/make.conf'
messages = [
"You are now ready to add overlays into your system.",
"",
@@ -126,7 +129,7 @@ class Main(object):
"",
"If this is the very first overlay you add with layman,",
"you need to append the following statement to your",
- "/etc/portage/make.conf file:",
+ "%s file:" %make_conf,
"",
" source /var/lib/layman/make.conf",
"",