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
diff --git a/checkbox_support/scripts/zapper_proxy.py b/checkbox_support/scripts/zapper_proxy.py
index e591f71..d3db200 100644
--- a/checkbox_support/scripts/zapper_proxy.py
+++ b/checkbox_support/scripts/zapper_proxy.py
@@ -162,9 +162,9 @@ def main():
162 # generate argparse from the interface of Zapper Control162 # generate argparse from the interface of Zapper Control
163 parser = AutoArgParser(cls=IZapperControl)163 parser = AutoArgParser(cls=IZapperControl)
164 parser.add_argument(164 parser.add_argument(
165 '--host', default=os.environ.get('ZAPPER_ADDRESS'),165 '--host', default=os.environ.get('ZAPPER_HOST'),
166 help=("Address of Zapper to connect to. If not supplied, "166 help=("Address of Zapper to connect to. If not supplied, "
167 "ZAPPER_ADDRESS environment variable will be used.")167 "ZAPPER_HOST environment variable will be used.")
168 )168 )
169 # turn Namespace into a normal dict169 # turn Namespace into a normal dict
170 args = parser.parse_args()170 args = parser.parse_args()
@@ -174,7 +174,7 @@ def main():
174 if host is None:174 if host is None:
175 raise SystemExit(175 raise SystemExit(
176 "You have to provide Zapper host, either via '--host' or via "176 "You have to provide Zapper host, either via '--host' or via "
177 "ZAPPER_ADDRESS environment variable")177 "ZAPPER_HOST environment variable")
178 zapper_control = decider.decide(host)178 zapper_control = decider.decide(host)
179 parser.run(zapper_control)179 parser.run(zapper_control)
180180

Subscribers

People subscribed via source and target branches