system-service

Merge lp:~davidmhewitt/system-service/fix-1740596 into lp:system-service

  1. fix-1740596
  2. Merge into ubuntu
Proposed by David Hewitt
Status: Merged
Merged at revision: 79
Proposed branch: lp:~davidmhewitt/system-service/fix-1740596
Merge into: lp:system-service
Diff against target: 12 lines (+1/-1)
1 file modified
UbuntuSystemService/backend.py (+1/-1)
To merge this branch: bzr merge lp:~davidmhewitt/system-service/fix-1740596
Reviewer Review Type Date Requested Status
Ubuntu Core Development Team Pending
Review via email: mp+335605@code.launchpad.net

Commit message

Use _clear_etc_environment_no_proxy instead of _clear_no_proxy

Description of the change

A non-existent method was being used in the set_no_proxy method when trying to clear the config. This change corrects this and uses the existing method.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'UbuntuSystemService/backend.py'
2--- UbuntuSystemService/backend.py 2015-04-15 12:18:32 +0000
3+++ UbuntuSystemService/backend.py 2017-12-30 13:55:23 +0000
4@@ -284,7 +284,7 @@
5
6 # set (or reset)
7 if new_no_proxy == "" or new_no_proxy is None:
8- res = self._clear_no_proxy()
9+ res = self._clear_etc_environment_no_proxy()
10 else:
11 res = self._write_etc_environment_no_proxy(new_no_proxy)
12 return res

Subscribers

People subscribed via source and target branches