Merge ~pgentili/checkbox-support:zapper-env-duplicate into checkbox-support:master

Proposed by Paolo Gentili
Status: Merged
Approved by: Paolo Gentili
Approved revision: c2340de3229f799d74685aef29fa12e1c62164be
Merged at revision: de7424b63e0f581d89cb706d12648f1768b35494
Proposed branch: ~pgentili/checkbox-support:zapper-env-duplicate
Merge into: checkbox-support:master
Diff against target: 24 lines (+3/-3)
1 file modified
checkbox_support/scripts/zapper_proxy.py (+3/-3)
Reviewer Review Type Date Requested Status
Maciej Kisielewski Approve
Review via email: mp+430634@code.launchpad.net

Commit message

Change: renamed env variable for zapper host ip address

Description of the change

Provided environment variable from checkbox is ZAPPER_HOST, not ZAPPER_ADDRESS

To post a comment you must log in.
Revision history for this message
Maciej Kisielewski (kissiel) wrote :

+1!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/checkbox_support/scripts/zapper_proxy.py b/checkbox_support/scripts/zapper_proxy.py
2index e591f71..d3db200 100644
3--- a/checkbox_support/scripts/zapper_proxy.py
4+++ b/checkbox_support/scripts/zapper_proxy.py
5@@ -162,9 +162,9 @@ def main():
6 # generate argparse from the interface of Zapper Control
7 parser = AutoArgParser(cls=IZapperControl)
8 parser.add_argument(
9- '--host', default=os.environ.get('ZAPPER_ADDRESS'),
10+ '--host', default=os.environ.get('ZAPPER_HOST'),
11 help=("Address of Zapper to connect to. If not supplied, "
12- "ZAPPER_ADDRESS environment variable will be used.")
13+ "ZAPPER_HOST environment variable will be used.")
14 )
15 # turn Namespace into a normal dict
16 args = parser.parse_args()
17@@ -174,7 +174,7 @@ def main():
18 if host is None:
19 raise SystemExit(
20 "You have to provide Zapper host, either via '--host' or via "
21- "ZAPPER_ADDRESS environment variable")
22+ "ZAPPER_HOST environment variable")
23 zapper_control = decider.decide(host)
24 parser.run(zapper_control)
25

Subscribers

People subscribed via source and target branches