Fix flake8 complaints - E501

E501 line too long (92 > 88 characters)
E501 line too long (103 > 88 characters)
...

JIRA: COMPOSE-4108
Signed-off-by: Haibo Lin <hlin@redhat.com>
This commit is contained in:
Haibo Lin 2020-02-06 15:09:32 +08:00
parent 3eddcfccd8
commit c0193c9fca
55 changed files with 337 additions and 275 deletions

View file

@ -68,7 +68,7 @@ def main():
default=[],
action="append",
metavar="GROUPID",
help="keep this group in environments even if they are not defined in the comps",
help="keep this group in environments even if they are not defined in the comps", # noqa: E501
)
parser.add_argument(
"--no-cleanup",

View file

@ -94,7 +94,7 @@ def get_arguments(config):
"--fulltree",
action="store_true",
dest="fulltree",
help="build a tree that includes all packages built from corresponding source rpms (optional)",
help="build a tree that includes all packages built from corresponding source rpms (optional)", # noqa: E501
)
parser.add_argument(
"--nosource",
@ -112,7 +112,7 @@ def get_arguments(config):
"--nodownload",
action="store_true",
dest="nodownload",
help="disable downloading of packages. instead, print the package URLs (optional)",
help="disable downloading of packages. instead, print the package URLs (optional)", # noqa: E501
)
parser.add_argument(
"--norelnotes",
@ -150,7 +150,7 @@ def get_arguments(config):
"--isfinal",
default=False,
action="store_true",
help="Specify this is a GA tree, which causes betanag to be turned off during install",
help="Specify this is a GA tree, which causes betanag to be turned off during install", # noqa: E501
)
parser.add_argument(
"--nohash",
@ -171,14 +171,14 @@ def get_arguments(config):
"--multilib",
action="append",
metavar="METHOD",
help="Multilib method; can be specified multiple times; recommended: devel, runtime",
help="Multilib method; can be specified multiple times; recommended: devel, runtime", # noqa: E501
)
parser.add_argument(
"--lookaside-repo",
action="append",
dest="lookaside_repos",
metavar="NAME",
help="Specify lookaside repo name(s) (packages will used for depsolving but not be included in the output)",
help="Specify lookaside repo name(s) (packages will used for depsolving but not be included in the output)", # noqa: E501
)
parser.add_argument(
"--workdirbase",
@ -200,7 +200,7 @@ def get_arguments(config):
default=[],
action="append",
metavar="STRING",
help="Package glob for lorax to install before runtime-install.tmpl runs. (may be listed multiple times)",
help="Package glob for lorax to install before runtime-install.tmpl runs. (may be listed multiple times)", # noqa: E501
)
parser.add_argument(
"--multilibconf",
@ -275,7 +275,7 @@ def get_arguments(config):
dest="rootfs_size",
action=SetConfig,
default=False,
help="Size of root filesystem in GiB. If not specified, use lorax default value",
help="Size of root filesystem in GiB. If not specified, use lorax default value", # noqa: E501
)
parser.add_argument(
@ -341,7 +341,7 @@ def main():
enforcing = False
if enforcing:
print(
"WARNING: SELinux is enforcing. This may lead to a compose with selinux disabled."
"WARNING: SELinux is enforcing. This may lead to a compose with selinux disabled." # noqa: E501
)
print("Consider running with setenforce 0.")

View file

@ -52,7 +52,7 @@ def get_parser():
group.add_argument(
"--fulltree",
action="store_true",
help="build a tree that includes all packages built from corresponding source rpms (optional)",
help="build a tree that includes all packages built from corresponding source rpms (optional)", # noqa: E501
)
group.add_argument(
"--greedy",

View file

@ -51,7 +51,7 @@ def main():
)
parser.add_argument(
"--label",
help="specify compose label (example: Snapshot-1.0); required for production composes",
help="specify compose label (example: Snapshot-1.0); required for production composes", # noqa: E501
)
parser.add_argument(
"--no-label",
@ -71,7 +71,7 @@ def main():
dest="old_composes",
default=[],
action="append",
help="Path to directory with old composes. Reuse an existing repodata from the most recent compose.",
help="Path to directory with old composes. Reuse an existing repodata from the most recent compose.", # noqa: E501
)
parser.add_argument("--config", help="Config file", required=True)
parser.add_argument(
@ -149,7 +149,7 @@ def main():
metavar="STATUS",
action="append",
default=[],
help="only create latest symbol link to this compose when compose status matches specified status",
help="only create latest symbol link to this compose when compose status matches specified status", # noqa: E501
)
parser.add_argument(
"--print-output-dir",
@ -241,7 +241,7 @@ def main():
# Remove when all config files are up to date
if "productimg" in opts.skip_phase or "productimg" in opts.just_phase:
print(
"WARNING: productimg phase has been removed, please remove it from --skip-phase or --just-phase option",
"WARNING: productimg phase has been removed, please remove it from --skip-phase or --just-phase option", # noqa: E501
file=sys.stderr,
)
for err in errors[:]:
@ -402,8 +402,9 @@ def run_compose(compose, create_latest_link=True, latest_link_status=None):
.rstrip("\n")
)
except IOError:
# Filename is not print intentionally in case someone puts password directly into the option
err_msg = "Cannot load password from file specified by 'signing_key_password_file' option"
# Filename is not print intentionally in case someone puts
# password directly into the option
err_msg = "Cannot load password from file specified by 'signing_key_password_file' option" # noqa: E501
compose.log_error(err_msg)
print(err_msg)
raise RuntimeError(err_msg)
@ -479,7 +480,8 @@ def run_compose(compose, create_latest_link=True, latest_link_status=None):
latest_link = False
if create_latest_link:
if latest_link_status is None:
# create latest symbol link by default if latest_link_status is not specified
# create latest symbol link by default if latest_link_status
# is not specified
latest_link = True
else:
latest_link_status = [s.upper() for s in latest_link_status]
@ -487,7 +489,8 @@ def run_compose(compose, create_latest_link=True, latest_link_status=None):
latest_link = True
else:
compose.log_warning(
"Compose status (%s) doesn't match with specified latest-link-status (%s), not create latest link."
"Compose status (%s) doesn't match with specified "
"latest-link-status (%s), not create latest link."
% (compose.get_status(), str(latest_link_status))
)