centos/centpkg
1
0
Fork 0
mirror of https://git.centos.org/centos/centpkg.git synced 2025-02-23 08:12:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Proper log output

Browse source
This commit is contained in:
Troy Dawson 2023-02-27 09:54:37 -08:00
parent 1e7ef8239a
commit 315e8a0cdd
1 changed files with 18 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/centpkg/cli.py
View file

@ -169,6 +169,7 @@ class centpkgClient(cliClient):
rhel_dist_git = config_get_safely(cfg, "centpkg.internal", 'rhel_dist_git')
# Find out divergent branch and stabalization
self.log.info("Checking rhel-target information:")
stream_version = self.cmd.target.split('-')[0]
rhel_version = centpkg.utils.stream_mapping(stream_version)
active_y, in_stabilization = centpkg.utils.determine_active_y_version(rhel_version, pp_api_url)
@ -181,13 +182,13 @@ class centpkgClient(cliClient):
# Good to know
if divergent_branch :
print("divergent_branch: TRUE")
self.log.info(" A divergent branch was found.")
else:
print("divergent_branch: FALSE")
self.log.info(" A divergent branch was not found.")
if in_stabilization :
print("in_stabilization: TRUE")
self.log.info(" We are in stabilization mode.")
else:
print("in_stabilization: FALSE")
self.log.info(" We are not in stabilization mode.")
# Update args.custom_user_metadata
if hasattr(self.args, 'custom_user_metadata') and self.args.custom_user_metadata:
@ -206,10 +207,10 @@ class centpkgClient(cliClient):
elif not divergent_branch and not in_stabilization :
temp_custom_user_metadata["rhel-target"] = "zstream"
else:
print("We are currently in Stabalization mode")
print("You must either set the rhel-target (--rhel-target)")
print("or branch for the previous version.")
print("Exiting")
self.log.info("We are currently in Stabalization mode")
self.log.info("You must either set the rhel-target (--rhel-target)")
self.log.info("or branch for the previous version.")
self.log.info("Exiting")
raise SystemExit
self.args.custom_user_metadata = json.dumps(temp_custom_user_metadata)
else:
@ -222,24 +223,24 @@ class centpkgClient(cliClient):
elif not divergent_branch and not in_stabilization :
self.args.custom_user_metadata = '{"rhel-target": "zstream"}'
else:
print("We are currently in Stabalization mode")
print("You must either set the rhel-target (--rhel-target)")
print("or branch for the previous version.")
print("Exiting")
self.log.info("We are currently in Stabalization mode")
self.log.info("You must either set the rhel-target (--rhel-target)")
self.log.info("or branch for the previous version.")
self.log.info("Exiting")
raise SystemExit
# Good to know, but take out for final cut
print('Metadata: %r', self.args.custom_user_metadata)
self.log.info(" rhel-target: " + json.loads(self.args.custom_user_metadata)['rhel-target'])
# Purposely fail during testing so we do not have so many builds
#self.args.custom_user_metadata = json.loads(self.args.custom_user_metadata)
# self.args.custom_user_metadata = json.loads(self.args.custom_user_metadata)
else:
if not self.args.scratch:
print("NO SCRATCH BUILD")
print("Only scratch builds are allowed without internal configurations")
print("Exiting")
self.log.info("NO SCRATCH BUILD")
self.log.info("Only scratch builds are allowed without internal configurations")
self.log.info("Exiting")
raise SystemExit
# Proceed with build