From 54e95c897ccf46d94bd888b0cad815c748ba8417 Mon Sep 17 00:00:00 2001 From: "Anthony G. Basile" Date: Sun, 28 Jan 2018 07:09:25 -0500 Subject: grs: prettify __init__ arguments --- grs/ISOIt.py | 8 ++++++-- grs/Kernel.py | 8 ++++++-- grs/PivotChroot.py | 4 +++- grs/Populate.py | 7 +++++-- grs/RunScript.py | 4 +++- grs/Seed.py | 8 ++++++-- grs/TarIt.py | 7 ++++++- 7 files changed, 35 insertions(+), 11 deletions(-) diff --git a/grs/ISOIt.py b/grs/ISOIt.py index d24a542..20e820f 100644 --- a/grs/ISOIt.py +++ b/grs/ISOIt.py @@ -27,8 +27,12 @@ class ISOIt(HashIt): """ Create a bootable ISO of the system. """ def __init__( - self, name, libdir=CONST.LIBDIR, tmpdir=CONST.TMPDIR, - portage_configroot=CONST.PORTAGE_CONFIGROOT, logfile=CONST.LOGFILE + self, + name, + libdir=CONST.LIBDIR, + tmpdir=CONST.TMPDIR, + portage_configroot=CONST.PORTAGE_CONFIGROOT, + logfile=CONST.LOGFILE ): self.libdir = libdir self.tmpdir = tmpdir diff --git a/grs/Kernel.py b/grs/Kernel.py index fe411bd..bd89ee2 100644 --- a/grs/Kernel.py +++ b/grs/Kernel.py @@ -28,8 +28,12 @@ class Kernel(): """ Build a linux-image pkg and install when building a system. """ def __init__( - self, libdir=CONST.LIBDIR, portage_configroot=CONST.PORTAGE_CONFIGROOT, - kernelroot=CONST.KERNELROOT, package=CONST.PACKAGE, logfile=CONST.LOGFILE + self, + libdir=CONST.LIBDIR, + portage_configroot=CONST.PORTAGE_CONFIGROOT, + kernelroot=CONST.KERNELROOT, + package=CONST.PACKAGE, + logfile=CONST.LOGFILE ): self.libdir = libdir self.portage_configroot = portage_configroot diff --git a/grs/PivotChroot.py b/grs/PivotChroot.py index 8958c99..46cb839 100644 --- a/grs/PivotChroot.py +++ b/grs/PivotChroot.py @@ -27,7 +27,9 @@ class PivotChroot(Rotator): """ Move an inner chroot out to the new system portage configroot. """ def __init__( - self, tmpdir=CONST.TMPDIR, portage_configroot=CONST.PORTAGE_CONFIGROOT, + self, + tmpdir=CONST.TMPDIR, + portage_configroot=CONST.PORTAGE_CONFIGROOT, logfile=CONST.LOGFILE ): self.tmpdir = tmpdir diff --git a/grs/Populate.py b/grs/Populate.py index 8232c36..71c743a 100644 --- a/grs/Populate.py +++ b/grs/Populate.py @@ -27,8 +27,11 @@ class Populate(): """ def __init__( - self, libdir=CONST.LIBDIR, workdir=CONST.WORKDIR, - portage_configroot=CONST.PORTAGE_CONFIGROOT, logfile=CONST.LOGFILE + self, + libdir=CONST.LIBDIR, + workdir=CONST.WORKDIR, + portage_configroot=CONST.PORTAGE_CONFIGROOT, + logfile=CONST.LOGFILE ): self.libdir = libdir self.workdir = workdir diff --git a/grs/RunScript.py b/grs/RunScript.py index ff45aed..1ecc221 100644 --- a/grs/RunScript.py +++ b/grs/RunScript.py @@ -25,7 +25,9 @@ class RunScript(): """ Run a script within the chroot. """ def __init__( - self, libdir=CONST.LIBDIR, portage_configroot=CONST.PORTAGE_CONFIGROOT, + self, + libdir=CONST.LIBDIR, + portage_configroot=CONST.PORTAGE_CONFIGROOT, logfile=CONST.LOGFILE ): self.libdir = libdir diff --git a/grs/Seed.py b/grs/Seed.py index f610228..ae8c524 100644 --- a/grs/Seed.py +++ b/grs/Seed.py @@ -29,8 +29,12 @@ class Seed(Rotator): """ Download a stage tarball and unpack it into an empty system portage configroot. """ def __init__( - self, stage_uri, tmpdir=CONST.TMPDIR, portage_configroot=CONST.PORTAGE_CONFIGROOT, - package=CONST.PACKAGE, logfile=CONST.LOGFILE + self, + stage_uri, + tmpdir=CONST.TMPDIR, + portage_configroot=CONST.PORTAGE_CONFIGROOT, + package=CONST.PACKAGE, + logfile=CONST.LOGFILE ): self.stage_uri = stage_uri self.portage_configroot = portage_configroot diff --git a/grs/TarIt.py b/grs/TarIt.py index b3d3b32..aef1b42 100644 --- a/grs/TarIt.py +++ b/grs/TarIt.py @@ -25,7 +25,12 @@ from grs.HashIt import HashIt class TarIt(HashIt): """ Create a tarball of the system. """ - def __init__(self, name, portage_configroot=CONST.PORTAGE_CONFIGROOT, logfile=CONST.LOGFILE): + def __init__( + self, + name, + portage_configroot=CONST.PORTAGE_CONFIGROOT, + logfile=CONST.LOGFILE + ): self.portage_configroot = portage_configroot self.logfile = logfile # Prepare a year, month and day for a tarball name timestamp. -- cgit v1.2.3-65-gdbad