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 320FB13888F for ; Wed, 7 Oct 2015 11:03:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6C476E080D; Wed, 7 Oct 2015 11:03:52 +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 1C829E080D for ; Wed, 7 Oct 2015 11:03:52 +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 D433634086E for ; Wed, 7 Oct 2015 11:03:48 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0A8A1279 for ; Wed, 7 Oct 2015 11:03:41 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1444216149.2e2d3ef3dc540b756bcbddd3d2f871367b297c59.blueness@gentoo> Subject: [gentoo-commits] proj/grss:master commit in: grs/ X-VCS-Repository: proj/grss X-VCS-Files: grs/ISOIt.py grs/WorldConf.py X-VCS-Directories: grs/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: 2e2d3ef3dc540b756bcbddd3d2f871367b297c59 X-VCS-Branch: master Date: Wed, 7 Oct 2015 11:03:41 +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: 985a9fa7-6574-420f-a479-a88f96dca6a6 X-Archives-Hash: e9aa95fc9b54d012e1d5fc4ba67c250f commit: 2e2d3ef3dc540b756bcbddd3d2f871367b297c59 Author: Anthony G. Basile gentoo org> AuthorDate: Wed Oct 7 11:09:09 2015 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Wed Oct 7 11:09:09 2015 +0000 URL: https://gitweb.gentoo.org/proj/grss.git/commit/?id=2e2d3ef3 lint: fix indentations. grs/ISOIt.py | 12 ++++++------ grs/WorldConf.py | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/grs/ISOIt.py b/grs/ISOIt.py index e64e9d3..ae6b217 100644 --- a/grs/ISOIt.py +++ b/grs/ISOIt.py @@ -59,13 +59,13 @@ class ISOIt(HashIt): # Emerge busybox. os.symlink( - '/usr/portage/profiles/hardened/linux/amd64', - makeprofile_path + '/usr/portage/profiles/hardened/linux/amd64', + makeprofile_path ) cmd = 'emerge --nodeps -1q busybox' emerge_env = { - 'USE' : '-* savedconfig', 'ROOT' : busybox_root, - 'PORTAGE_CONFIGROOT' : busybox_root + 'USE' : '-* savedconfig', 'ROOT' : busybox_root, + 'PORTAGE_CONFIGROOT' : busybox_root } Execute(cmd, timeout=600, extra_env=emerge_env, logfile=self.logfile) @@ -73,8 +73,8 @@ class ISOIt(HashIt): initramfs_root = os.path.join(self.tmpdir, 'initramfs') shutil.rmtree(initramfs_root, ignore_errors=True) root_paths = [ - 'bin', 'dev', 'etc', 'mnt/cdrom', 'mnt/squashfs', 'mnt/tmpfs', 'proc', 'sbin', - 'sys', 'tmp', 'usr/bin', 'usr/sbin', 'var', 'var/run' + 'bin', 'dev', 'etc', 'mnt/cdrom', 'mnt/squashfs', 'mnt/tmpfs', 'proc', 'sbin', 'sys', + 'tmp', 'usr/bin', 'usr/sbin', 'var', 'var/run' ] for p in root_paths: d = os.path.join(initramfs_root, p) diff --git a/grs/WorldConf.py b/grs/WorldConf.py index 5cc7672..e196338 100644 --- a/grs/WorldConf.py +++ b/grs/WorldConf.py @@ -50,7 +50,7 @@ class WorldConf(): # Now we can read world.conf and populate an empty /etc/portage. config = configparser.RawConfigParser( - delimiters=':', allow_no_value=True, comment_prefixes=None + delimiters=':', allow_no_value=True, comment_prefixes=None ) config.read(CONST.WORLD_CONFIG) for s in config.sections(): @@ -94,7 +94,7 @@ class WorldConf(): # Also let's get a list of all the possible canonical file names config = configparser.RawConfigParser( - delimiters=':', allow_no_value=True, comment_prefixes=None + delimiters=':', allow_no_value=True, comment_prefixes=None ) config.read(CONST.WORLD_CONFIG) canon = []