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 63240138ACF for ; Tue, 3 Feb 2015 02:43:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 875A5E0953; Tue, 3 Feb 2015 02:43:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 09B9EE0953 for ; Tue, 3 Feb 2015 02:43:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2263D340730 for ; Tue, 3 Feb 2015 02:43:39 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 19A6810EF9 for ; Tue, 3 Feb 2015 02:43:36 +0000 (UTC) From: "Devan Franchini" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Devan Franchini" Message-ID: <1422931421.854b4944acf466573f4fde14c6bd36807be0b220.twitch153@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: twitch153 X-VCS-Committer-Name: Devan Franchini X-VCS-Revision: 854b4944acf466573f4fde14c6bd36807be0b220 X-VCS-Branch: master Date: Tue, 3 Feb 2015 02:43:36 +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: be6ce1b4-68eb-459c-bc6e-0986a4af83b8 X-Archives-Hash: dd2d068ccacdbcc34f9c9e895ef9c5f6 commit: 854b4944acf466573f4fde14c6bd36807be0b220 Author: Devan Franchini gentoo org> AuthorDate: Tue Feb 3 02:43:41 2015 +0000 Commit: Devan Franchini gentoo org> CommitDate: Tue Feb 3 02:43:41 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/layman.git;a=commit;h=854b4944 updater.py: Modifies print_instructions function to optionally output make.conf information --- layman/updater.py | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/layman/updater.py b/layman/updater.py index 874e3c3..7ccc9bd 100644 --- a/layman/updater.py +++ b/layman/updater.py @@ -133,9 +133,6 @@ 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.", "", @@ -146,19 +143,23 @@ class Main(object): "Select an overlay and add it using", "", " layman -a overlay-name", - "", - "If this is the very first overlay you add with layman,", - "you need to append the following statement to your", - "%s file:" %make_conf, - "", - " source /var/lib/layman/make.conf", - "", - "If you modify the 'storage' parameter in the layman", - "configuration file (/etc/layman/layman.cfg) you will", - "need to adapt the path given above to the new storage", - "directory.", - "", - ] + "",] + if 'make.conf' in self.config['conf_type']: + make_conf = '/etc/portage/make.conf' + if not os.access(make_conf, os.F_OK): + make_conf = '/etc/make.conf' + message += [ + "If this is the very first overlay you add with layman,", + "you need to append the following statement to your", + "%s file:" % make_conf, + "", + " source /var/lib/layman/make.conf", + "", + "If you modify the 'storage' parameter in the layman", + "configuration file (/etc/layman/layman.cfg) you will", + "need to adapt the path given above to the new storage", + "directory.", + "",] for message in messages: self.output.info(" " + message)