Re: [Cloud-init-dev] [Merge] ~chad.smith/cloud-init:cleanup/report-unreadable-instance-data into cloud-init:master

2018-10-30 Thread Chad Smith 



Diff comments:

> diff --git a/cloudinit/cmd/query.py b/cloudinit/cmd/query.py
> index ff03de9..650bc0a 100644
> --- a/cloudinit/cmd/query.py
> +++ b/cloudinit/cmd/query.py
> @@ -106,8 +107,11 @@ def handle_args(name, args):
>  
>  try:
>  instance_json = util.load_file(instance_data_fn)
> -except IOError:
> -LOG.error('Missing instance-data.json file: %s', instance_data_fn)
> +except (IOError, OSError) as e:
> +if e.errno == EACCES:
> +LOG.error('No read permission on %s. Try sudo', instance_data_fn)

fixed thanks.

> +else:
> +LOG.error('Missing instance-data file: %s', instance_data_fn)
>  return 1
>  
>  instance_data = util.load_json(instance_json)


-- 
https://code.launchpad.net/~chad.smith/cloud-init/+git/cloud-init/+merge/358041
Your team cloud-init commiters is requested to review the proposed merge of 
~chad.smith/cloud-init:cleanup/report-unreadable-instance-data into 
cloud-init:master.

___
Mailing list: https://launchpad.net/~cloud-init-dev
Post to : cloud-init-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~cloud-init-dev
More help   : https://help.launchpad.net/ListHelp

Re: [Cloud-init-dev] [Merge] ~chad.smith/cloud-init:cleanup/report-unreadable-instance-data into cloud-init:master

2018-10-30 Thread Server Team CI bot 
Review: Approve continuous-integration

PASSED: Continuous integration, rev:32a1a647b1b5a3588965e18e84f6dca61f9e7683
https://jenkins.ubuntu.com/server/job/cloud-init-ci/418/
Executed test runs:
SUCCESS: Checkout
SUCCESS: Unit & Style Tests
SUCCESS: Ubuntu LTS: Build
SUCCESS: Ubuntu LTS: Integration
IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/418/rebuild

-- 
https://code.launchpad.net/~chad.smith/cloud-init/+git/cloud-init/+merge/358041
Your team cloud-init commiters is requested to review the proposed merge of 
~chad.smith/cloud-init:cleanup/report-unreadable-instance-data into 
cloud-init:master.

___
Mailing list: https://launchpad.net/~cloud-init-dev
Post to : cloud-init-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~cloud-init-dev
More help   : https://help.launchpad.net/ListHelp

Re: [Cloud-init-dev] [Merge] ~chad.smith/cloud-init:cleanup/report-unreadable-instance-data into cloud-init:master

2018-10-30 Thread Server Team CI bot 
Review: Approve continuous-integration

PASSED: Continuous integration, rev:c09cbc607d55235f16c9654e8a170374a576107f
https://jenkins.ubuntu.com/server/job/cloud-init-ci/417/
Executed test runs:
SUCCESS: Checkout
SUCCESS: Unit & Style Tests
SUCCESS: Ubuntu LTS: Build
SUCCESS: Ubuntu LTS: Integration
IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/417/rebuild

-- 
https://code.launchpad.net/~chad.smith/cloud-init/+git/cloud-init/+merge/358041
Your team cloud-init commiters is requested to review the proposed merge of 
~chad.smith/cloud-init:cleanup/report-unreadable-instance-data into 
cloud-init:master.

___
Mailing list: https://launchpad.net/~cloud-init-dev
Post to : cloud-init-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~cloud-init-dev
More help   : https://help.launchpad.net/ListHelp

Re: [Cloud-init-dev] [Merge] ~chad.smith/cloud-init:cleanup/report-unreadable-instance-data into cloud-init:master

2018-10-30 Thread Scott Moser 
seems sane. one request.


Diff comments:

> diff --git a/cloudinit/cmd/query.py b/cloudinit/cmd/query.py
> index ff03de9..650bc0a 100644
> --- a/cloudinit/cmd/query.py
> +++ b/cloudinit/cmd/query.py
> @@ -106,8 +107,11 @@ def handle_args(name, args):
>  
>  try:
>  instance_json = util.load_file(instance_data_fn)
> -except IOError:
> -LOG.error('Missing instance-data.json file: %s', instance_data_fn)
> +except (IOError, OSError) as e:
> +if e.errno == EACCES:
> +LOG.error('No read permission on %s. Try sudo', instance_data_fn)

no read permission on '%s'

add the single quote here and below i think.

> +else:
> +LOG.error('Missing instance-data file: %s', instance_data_fn)
>  return 1
>  
>  instance_data = util.load_json(instance_json)


-- 
https://code.launchpad.net/~chad.smith/cloud-init/+git/cloud-init/+merge/358041
Your team cloud-init commiters is requested to review the proposed merge of 
~chad.smith/cloud-init:cleanup/report-unreadable-instance-data into 
cloud-init:master.

___
Mailing list: https://launchpad.net/~cloud-init-dev
Post to : cloud-init-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~cloud-init-dev
More help   : https://help.launchpad.net/ListHelp