| 1 |
commit: 2e2d3ef3dc540b756bcbddd3d2f871367b297c59 |
| 2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Oct 7 11:09:09 2015 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Oct 7 11:09:09 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/grss.git/commit/?id=2e2d3ef3 |
| 7 |
|
| 8 |
lint: fix indentations. |
| 9 |
|
| 10 |
grs/ISOIt.py | 12 ++++++------ |
| 11 |
grs/WorldConf.py | 4 ++-- |
| 12 |
2 files changed, 8 insertions(+), 8 deletions(-) |
| 13 |
|
| 14 |
diff --git a/grs/ISOIt.py b/grs/ISOIt.py |
| 15 |
index e64e9d3..ae6b217 100644 |
| 16 |
--- a/grs/ISOIt.py |
| 17 |
+++ b/grs/ISOIt.py |
| 18 |
@@ -59,13 +59,13 @@ class ISOIt(HashIt): |
| 19 |
|
| 20 |
# Emerge busybox. |
| 21 |
os.symlink( |
| 22 |
- '/usr/portage/profiles/hardened/linux/amd64', |
| 23 |
- makeprofile_path |
| 24 |
+ '/usr/portage/profiles/hardened/linux/amd64', |
| 25 |
+ makeprofile_path |
| 26 |
) |
| 27 |
cmd = 'emerge --nodeps -1q busybox' |
| 28 |
emerge_env = { |
| 29 |
- 'USE' : '-* savedconfig', 'ROOT' : busybox_root, |
| 30 |
- 'PORTAGE_CONFIGROOT' : busybox_root |
| 31 |
+ 'USE' : '-* savedconfig', 'ROOT' : busybox_root, |
| 32 |
+ 'PORTAGE_CONFIGROOT' : busybox_root |
| 33 |
} |
| 34 |
Execute(cmd, timeout=600, extra_env=emerge_env, logfile=self.logfile) |
| 35 |
|
| 36 |
@@ -73,8 +73,8 @@ class ISOIt(HashIt): |
| 37 |
initramfs_root = os.path.join(self.tmpdir, 'initramfs') |
| 38 |
shutil.rmtree(initramfs_root, ignore_errors=True) |
| 39 |
root_paths = [ |
| 40 |
- 'bin', 'dev', 'etc', 'mnt/cdrom', 'mnt/squashfs', 'mnt/tmpfs', 'proc', 'sbin', |
| 41 |
- 'sys', 'tmp', 'usr/bin', 'usr/sbin', 'var', 'var/run' |
| 42 |
+ 'bin', 'dev', 'etc', 'mnt/cdrom', 'mnt/squashfs', 'mnt/tmpfs', 'proc', 'sbin', 'sys', |
| 43 |
+ 'tmp', 'usr/bin', 'usr/sbin', 'var', 'var/run' |
| 44 |
] |
| 45 |
for p in root_paths: |
| 46 |
d = os.path.join(initramfs_root, p) |
| 47 |
|
| 48 |
diff --git a/grs/WorldConf.py b/grs/WorldConf.py |
| 49 |
index 5cc7672..e196338 100644 |
| 50 |
--- a/grs/WorldConf.py |
| 51 |
+++ b/grs/WorldConf.py |
| 52 |
@@ -50,7 +50,7 @@ class WorldConf(): |
| 53 |
|
| 54 |
# Now we can read world.conf and populate an empty /etc/portage. |
| 55 |
config = configparser.RawConfigParser( |
| 56 |
- delimiters=':', allow_no_value=True, comment_prefixes=None |
| 57 |
+ delimiters=':', allow_no_value=True, comment_prefixes=None |
| 58 |
) |
| 59 |
config.read(CONST.WORLD_CONFIG) |
| 60 |
for s in config.sections(): |
| 61 |
@@ -94,7 +94,7 @@ class WorldConf(): |
| 62 |
|
| 63 |
# Also let's get a list of all the possible canonical file names |
| 64 |
config = configparser.RawConfigParser( |
| 65 |
- delimiters=':', allow_no_value=True, comment_prefixes=None |
| 66 |
+ delimiters=':', allow_no_value=True, comment_prefixes=None |
| 67 |
) |
| 68 |
config.read(CONST.WORLD_CONFIG) |
| 69 |
canon = [] |
Archives