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 6C25813888F for ; Sun, 11 Oct 2015 17:26:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CBDC6E085B; Sun, 11 Oct 2015 17:26:41 +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 D4D09E07F2 for ; Sun, 11 Oct 2015 17:26:40 +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 E21C933FD3F for ; Sun, 11 Oct 2015 17:26:39 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 69C83DF0 for ; Sun, 11 Oct 2015 17:26:37 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1444521276.e60ef20eb3ef4d64a9d7b24f4b1d2d36c026ff7c.vapier@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: catalyst/targets/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/targets/stage1.py X-VCS-Directories: catalyst/targets/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: e60ef20eb3ef4d64a9d7b24f4b1d2d36c026ff7c X-VCS-Branch: master Date: Sun, 11 Oct 2015 17:26:37 +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: 5576af60-1c43-4897-90e5-d261392e0f7f X-Archives-Hash: 20e6f960b0787eac788a49b926034013 commit: e60ef20eb3ef4d64a9d7b24f4b1d2d36c026ff7c Author: Mike Frysinger gentoo org> AuthorDate: Sat Oct 10 05:11:40 2015 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Sat Oct 10 23:54:36 2015 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=e60ef20e stage1: convert to log module catalyst/targets/stage1.py | 38 ++++++++++++++++---------------------- 1 file changed, 16 insertions(+), 22 deletions(-) diff --git a/catalyst/targets/stage1.py b/catalyst/targets/stage1.py index b5dfac7..18ef520 100644 --- a/catalyst/targets/stage1.py +++ b/catalyst/targets/stage1.py @@ -5,6 +5,9 @@ stage1 target import os +from snakeoil import fileutils + +from catalyst import log from catalyst.support import normpath from catalyst.fileops import ensure_dirs from catalyst.base.stagebase import StageBase @@ -22,12 +25,12 @@ class stage1(StageBase): def set_stage_path(self): self.settings["stage_path"]=normpath(self.settings["chroot_path"]+self.settings["root_path"]) - print "stage1 stage path is "+self.settings["stage_path"] + log.notice('stage1 stage path is %s', self.settings['stage_path']) def set_root_path(self): # sets the root path, relative to 'chroot_path', of the stage1 root self.settings["root_path"]=normpath("/tmp/stage1root") - print "stage1 root path is "+self.settings["root_path"] + log.info('stage1 root path is %s', self.settings['root_path']) def set_cleanables(self): StageBase.set_cleanables(self) @@ -55,10 +58,10 @@ class stage1(StageBase): def set_portage_overlay(self): StageBase.set_portage_overlay(self) if "portage_overlay" in self.settings: - print "\nWARNING !!!!!" - print "\tUsing an portage overlay for earlier stages could cause build issues." - print "\tIf you break it, you buy it. Don't complain to us about it." - print "\tDont say we did not warn you\n" + log.warning( + 'Using an overlay for earlier stages could cause build issues.\n' + "If you break it, you buy it. Don't complain to us about it.\n" + "Don't say we did not warn you.") def base_dirs(self): if os.uname()[0] == "FreeBSD": @@ -67,22 +70,13 @@ class stage1(StageBase): # since proc and dev are not writeable, so...create them here ensure_dirs(self.settings["stage_path"]+"/proc") ensure_dirs(self.settings["stage_path"]+"/dev") - if not os.path.isfile(self.settings["stage_path"]+"/proc/.keep"): - try: - proc_keepfile = open(self.settings["stage_path"]+"/proc/.keep","w") - proc_keepfile.write('') - proc_keepfile.close() - except IOError: - print "!!! Failed to create %s" % (self.settings["stage_path"]+"/dev/.keep") - if not os.path.isfile(self.settings["stage_path"]+"/dev/.keep"): - try: - dev_keepfile = open(self.settings["stage_path"]+"/dev/.keep","w") - dev_keepfile.write('') - dev_keepfile.close() - except IOError: - print "!!! Failed to create %s" % (self.settings["stage_path"]+"/dev/.keep") - else: - pass + for f in ('/proc', '/dev'): + f = self.settings['stage_path'] + f + '/.keep' + if not os.path.isfile(f): + try: + fileutils.touch(f) + except IOError: + log.error('Failed to create %s', f) def set_mounts(self): # stage_path/proc probably doesn't exist yet, so create it