diff options
-rw-r--r-- | grs/ISOIt.py | 12 | ||||
-rw-r--r-- | 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 = [] |