From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 0B15C138202 for ; Sun, 18 Nov 2012 22:15:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 95C1721C01E; Sun, 18 Nov 2012 22:15:28 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D19BD21C01E for ; Sun, 18 Nov 2012 22:15:27 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C065233D7A3 for ; Sun, 18 Nov 2012 22:15:26 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 312F9E5442 for ; Sun, 18 Nov 2012 22:15:24 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1353265706.79c6f8fd75d87831023d0785f4f24ca490cc92af.dol-sen@gentoo> Subject: [gentoo-commits] proj/layman:master commit in: layman/ X-VCS-Repository: proj/layman X-VCS-Files: layman/updater.py X-VCS-Directories: layman/ X-VCS-Committer: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 79c6f8fd75d87831023d0785f4f24ca490cc92af X-VCS-Branch: master Date: Sun, 18 Nov 2012 22:15:24 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: da1ceda8-b7c9-44d0-acb6-d60b348d6e7d X-Archives-Hash: 6808321b1671787e53316d3bd2ea77da commit: 79c6f8fd75d87831023d0785f4f24ca490cc92af Author: Brian Dolbec gentoo org> AuthorDate: Sun Nov 18 19:08:26 2012 +0000 Commit: Brian Dolbec gmail com> CommitDate: Sun Nov 18 19:08:26 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/layman.git;a=commit;h=79c6f8fd add auto detection for make.conf location --- layman/updater.py | 5 ++++- 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", "",