cloud-init-dev team mailing list archive

[Scott Moser <ssmoser2+ubuntu@xxxxxxxxx>]

one commit message fix. other than that, i approve.



Diff comments:

> diff --git a/cloudinit/cmd/devel/logs.py b/cloudinit/cmd/devel/logs.py
> index df72520..4c086b5 100644
> --- a/cloudinit/cmd/devel/logs.py
> +++ b/cloudinit/cmd/devel/logs.py
> @@ -118,21 +133,21 @@ def collect_logs(tarfile, include_userdata, verbosity=0):
>          with chdir(tmp_dir):
>              subp(['tar', 'czvf', tarfile, log_dir.replace(tmp_dir + '/', '')])
>      sys.stderr.write("Wrote %s\n" % tarfile)
> +    return 0
>  
>  
>  def handle_collect_logs_args(name, args):
>      """Handle calls to 'cloud-init collect-logs' as a subcommand."""
> -    collect_logs(args.tarfile, args.userdata, args.verbosity)
> +    return collect_logs(args.tarfile, args.userdata, args.verbosity)
>  
>  
>  def main():
>      """Tool to collect and tar all cloud-init related logs."""
>      parser = get_parser()
> -    handle_collect_logs_args('collect-logs', parser.parse_args())
> -    return 0
> +    return handle_collect_logs_args('collect-logs', parser.parse_args())
>  
>  
>  if __name__ == '__main__':
> -    main()
> +    sys.exit(main())

mention this fix in commit message.
I think its only valid when called as:
  python cloudinit.commands.collect_logs

>  
>  # vi: ts=4 expandtab


-- 
https://code.launchpad.net/~chad.smith/cloud-init/+git/cloud-init/+merge/359557
Your team cloud-init commiters is requested to review the proposed merge of ~chad.smith/cloud-init:bug/1805201-non-root-collect-logs into cloud-init:master.