Change the output in verbose mode

This new formatting makes it easier to grep the output

Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>
This commit is contained in:
Pierre-Yves Chibon 2019-12-10 09:45:05 +01:00
parent aa0e93f8f8
commit f17f2ae9df

View file

@ -286,10 +286,10 @@ class BugzillaProxy:
if new_poc in self.inverted_user_cache:
new_poc = self.inverted_user_cache[new_poc]
else:
new_poc = newpoc.split('@', 1)[0] + "@..."
new_poc = new_poc.split('@', 1)[0] + "@..."
print(
f' - reassigning bug #{bug.bug_id} '
f'from {bug.assigned_to} to {new_poc}'
f'[UPDATEBUG] {product}/{name} reassigning bug #{bug.bug_id} '
f'from {old_poc} to {new_poc}'
)
if not self.config["dryrun"]:
try:
@ -386,7 +386,6 @@ class BugzillaProxy:
data["is_active"] = not retired
if self.config["verbose"]:
print(f'[EDITCOMP] {data["product"]}/{data["component"]}')
for key in ["initialowner", "description", "initialqacontact", "initialcclist"]:
if data.get(key):
@ -421,10 +420,11 @@ class BugzillaProxy:
else:
old_value = ""
print(
f" {key} changed {old_value}"
f"[EDITCOMP] {data['product']}/{data['component']} {key} changed {old_value}"
f" to FAS name(s) `{new_value}`")
else:
print(f" {key} changed from `{old_value}` to `{new_value}`")
print(
f"[EDITCOMP] {data['product']}/{data['component']} {key} changed from `{old_value}` to `{new_value}`")
owner_changed = "initialowner" in data
@ -471,7 +471,6 @@ class BugzillaProxy:
data['initialcclist'] = initial_cc_emails
if self.config["verbose"]:
print(f"[ADDCOMP] {bz_product_name}/{package}")
for key in ["initialowner", "description", "initialqacontact",
"initialcclist", "is_active"]:
if print_fas_names and key in ('initialowner',
@ -483,9 +482,9 @@ class BugzillaProxy:
value = qacontact
else:
value = initial_cc_fasnames
print(f" {key} set to FAS name(s) `{value}`")
print(f"[ADDCOMP] {bz_product_name}/{package} {key} set to FAS name(s) `{value}`")
else:
print(f" {key} set to {data.get(key)}")
print(f"[ADDCOMP] {bz_product_name}/{package} {key} set to {data.get(key)}")
if not self.config["dryrun"]:
try:
self.server.addcomponent(data)