| 1 |
commit: 54e95c897ccf46d94bd888b0cad815c748ba8417 |
| 2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jan 28 12:09:25 2018 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jan 28 12:09:25 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/grss.git/commit/?id=54e95c89 |
| 7 |
|
| 8 |
grs: prettify __init__ arguments |
| 9 |
|
| 10 |
grs/ISOIt.py | 8 ++++++-- |
| 11 |
grs/Kernel.py | 8 ++++++-- |
| 12 |
grs/PivotChroot.py | 4 +++- |
| 13 |
grs/Populate.py | 7 +++++-- |
| 14 |
grs/RunScript.py | 4 +++- |
| 15 |
grs/Seed.py | 8 ++++++-- |
| 16 |
grs/TarIt.py | 7 ++++++- |
| 17 |
7 files changed, 35 insertions(+), 11 deletions(-) |
| 18 |
|
| 19 |
diff --git a/grs/ISOIt.py b/grs/ISOIt.py |
| 20 |
index d24a542..20e820f 100644 |
| 21 |
--- a/grs/ISOIt.py |
| 22 |
+++ b/grs/ISOIt.py |
| 23 |
@@ -27,8 +27,12 @@ class ISOIt(HashIt): |
| 24 |
""" Create a bootable ISO of the system. """ |
| 25 |
|
| 26 |
def __init__( |
| 27 |
- self, name, libdir=CONST.LIBDIR, tmpdir=CONST.TMPDIR, |
| 28 |
- portage_configroot=CONST.PORTAGE_CONFIGROOT, logfile=CONST.LOGFILE |
| 29 |
+ self, |
| 30 |
+ name, |
| 31 |
+ libdir=CONST.LIBDIR, |
| 32 |
+ tmpdir=CONST.TMPDIR, |
| 33 |
+ portage_configroot=CONST.PORTAGE_CONFIGROOT, |
| 34 |
+ logfile=CONST.LOGFILE |
| 35 |
): |
| 36 |
self.libdir = libdir |
| 37 |
self.tmpdir = tmpdir |
| 38 |
|
| 39 |
diff --git a/grs/Kernel.py b/grs/Kernel.py |
| 40 |
index fe411bd..bd89ee2 100644 |
| 41 |
--- a/grs/Kernel.py |
| 42 |
+++ b/grs/Kernel.py |
| 43 |
@@ -28,8 +28,12 @@ class Kernel(): |
| 44 |
""" Build a linux-image pkg and install when building a system. """ |
| 45 |
|
| 46 |
def __init__( |
| 47 |
- self, libdir=CONST.LIBDIR, portage_configroot=CONST.PORTAGE_CONFIGROOT, |
| 48 |
- kernelroot=CONST.KERNELROOT, package=CONST.PACKAGE, logfile=CONST.LOGFILE |
| 49 |
+ self, |
| 50 |
+ libdir=CONST.LIBDIR, |
| 51 |
+ portage_configroot=CONST.PORTAGE_CONFIGROOT, |
| 52 |
+ kernelroot=CONST.KERNELROOT, |
| 53 |
+ package=CONST.PACKAGE, |
| 54 |
+ logfile=CONST.LOGFILE |
| 55 |
): |
| 56 |
self.libdir = libdir |
| 57 |
self.portage_configroot = portage_configroot |
| 58 |
|
| 59 |
diff --git a/grs/PivotChroot.py b/grs/PivotChroot.py |
| 60 |
index 8958c99..46cb839 100644 |
| 61 |
--- a/grs/PivotChroot.py |
| 62 |
+++ b/grs/PivotChroot.py |
| 63 |
@@ -27,7 +27,9 @@ class PivotChroot(Rotator): |
| 64 |
""" Move an inner chroot out to the new system portage configroot. """ |
| 65 |
|
| 66 |
def __init__( |
| 67 |
- self, tmpdir=CONST.TMPDIR, portage_configroot=CONST.PORTAGE_CONFIGROOT, |
| 68 |
+ self, |
| 69 |
+ tmpdir=CONST.TMPDIR, |
| 70 |
+ portage_configroot=CONST.PORTAGE_CONFIGROOT, |
| 71 |
logfile=CONST.LOGFILE |
| 72 |
): |
| 73 |
self.tmpdir = tmpdir |
| 74 |
|
| 75 |
diff --git a/grs/Populate.py b/grs/Populate.py |
| 76 |
index 8232c36..71c743a 100644 |
| 77 |
--- a/grs/Populate.py |
| 78 |
+++ b/grs/Populate.py |
| 79 |
@@ -27,8 +27,11 @@ class Populate(): |
| 80 |
""" |
| 81 |
|
| 82 |
def __init__( |
| 83 |
- self, libdir=CONST.LIBDIR, workdir=CONST.WORKDIR, |
| 84 |
- portage_configroot=CONST.PORTAGE_CONFIGROOT, logfile=CONST.LOGFILE |
| 85 |
+ self, |
| 86 |
+ libdir=CONST.LIBDIR, |
| 87 |
+ workdir=CONST.WORKDIR, |
| 88 |
+ portage_configroot=CONST.PORTAGE_CONFIGROOT, |
| 89 |
+ logfile=CONST.LOGFILE |
| 90 |
): |
| 91 |
self.libdir = libdir |
| 92 |
self.workdir = workdir |
| 93 |
|
| 94 |
diff --git a/grs/RunScript.py b/grs/RunScript.py |
| 95 |
index ff45aed..1ecc221 100644 |
| 96 |
--- a/grs/RunScript.py |
| 97 |
+++ b/grs/RunScript.py |
| 98 |
@@ -25,7 +25,9 @@ class RunScript(): |
| 99 |
""" Run a script within the chroot. """ |
| 100 |
|
| 101 |
def __init__( |
| 102 |
- self, libdir=CONST.LIBDIR, portage_configroot=CONST.PORTAGE_CONFIGROOT, |
| 103 |
+ self, |
| 104 |
+ libdir=CONST.LIBDIR, |
| 105 |
+ portage_configroot=CONST.PORTAGE_CONFIGROOT, |
| 106 |
logfile=CONST.LOGFILE |
| 107 |
): |
| 108 |
self.libdir = libdir |
| 109 |
|
| 110 |
diff --git a/grs/Seed.py b/grs/Seed.py |
| 111 |
index f610228..ae8c524 100644 |
| 112 |
--- a/grs/Seed.py |
| 113 |
+++ b/grs/Seed.py |
| 114 |
@@ -29,8 +29,12 @@ class Seed(Rotator): |
| 115 |
""" Download a stage tarball and unpack it into an empty system portage configroot. """ |
| 116 |
|
| 117 |
def __init__( |
| 118 |
- self, stage_uri, tmpdir=CONST.TMPDIR, portage_configroot=CONST.PORTAGE_CONFIGROOT, |
| 119 |
- package=CONST.PACKAGE, logfile=CONST.LOGFILE |
| 120 |
+ self, |
| 121 |
+ stage_uri, |
| 122 |
+ tmpdir=CONST.TMPDIR, |
| 123 |
+ portage_configroot=CONST.PORTAGE_CONFIGROOT, |
| 124 |
+ package=CONST.PACKAGE, |
| 125 |
+ logfile=CONST.LOGFILE |
| 126 |
): |
| 127 |
self.stage_uri = stage_uri |
| 128 |
self.portage_configroot = portage_configroot |
| 129 |
|
| 130 |
diff --git a/grs/TarIt.py b/grs/TarIt.py |
| 131 |
index b3d3b32..aef1b42 100644 |
| 132 |
--- a/grs/TarIt.py |
| 133 |
+++ b/grs/TarIt.py |
| 134 |
@@ -25,7 +25,12 @@ from grs.HashIt import HashIt |
| 135 |
class TarIt(HashIt): |
| 136 |
""" Create a tarball of the system. """ |
| 137 |
|
| 138 |
- def __init__(self, name, portage_configroot=CONST.PORTAGE_CONFIGROOT, logfile=CONST.LOGFILE): |
| 139 |
+ def __init__( |
| 140 |
+ self, |
| 141 |
+ name, |
| 142 |
+ portage_configroot=CONST.PORTAGE_CONFIGROOT, |
| 143 |
+ logfile=CONST.LOGFILE |
| 144 |
+ ): |
| 145 |
self.portage_configroot = portage_configroot |
| 146 |
self.logfile = logfile |
| 147 |
# Prepare a year, month and day for a tarball name timestamp. |
Archives