Merge lp:~rodrigo-moya/system-service/fix-aptconf-issues into lp:system-service

[Rodrigo Moya]

[Michael Vogt (mvo)]

Thanks! Merged and pushed to oneirici-proposed.

In trunk I added a regression test

=== modified file 'backend/system-service-d'
--- backend/system-service-d	2011-07-21 08:09:18 +0000
+++ backend/system-service-d	2011-10-20 14:05:41 +0000
@@ -176,13 +176,6 @@
         confdir = apt_pkg.Config.FindDir("Dir::Etc") 
         if not self._verify_proxy(proxy_type, new_proxy):
             return False
-        # check for the easy case (no proxy setting in the config)
-        old_proxy = self._apt_proxy(proxy_type)
-        if old_proxy == "":
-            f=open(os.path.join(confdir, "apt.conf"),"a")
-            f.write("Acquire::%s::proxy \"%s\";\n" % (proxy_type, new_proxy))
-            f.close()
-            return True
         # now the difficult case (search the apt configuration files)
         # build the list of apt configuration files first
         apt_conffiles = [os.path.join(confdir,"apt.conf.d",n) for n in 
@@ -193,18 +186,17 @@
             new_content = []
             found = False
             for line in open(f):
-                if line.lower().startswith("acquire::%s::proxy" % proxy_type):
+                # Only replace the Acquire::%s::proxy entry, not other more
+                # complicated forms of the proxy settings
+                if line.lower().startswith("acquire::%s::proxy " % proxy_type):
                     found = True
                     line = "Acquire::%s::proxy \"%s\";\n" % (proxy_type, new_proxy)
-                # FIXME: scan for more complicated forms of the proxy
-                # settings and/or scan for the proxy string and just
-                # replace this
                 new_content.append(line)
             # if we found/replaced the proxy, write it out now
-            if found:
-                open(f,"w").write("".join(new_content))
-                return True
-        return False
+            if not found:
+                new_content.append("Acquire::%s::proxy \"%s\";\n" % (proxy_type, new_proxy))
+            open(f,"w").write("".join(new_content))
+        return True
 
     def _write_etc_environment_proxy(self, proxy_type, new_proxy):
         if not self._verify_proxy(proxy_type, new_proxy):
@@ -245,7 +237,9 @@
             new_content = []
             found = False
             for line in open(f):
-                if line.lower().startswith("acquire::%s::proxy" % proxy_type):
+                # Only remove the Acquire::%s::proxy entry, not other more
+                # complicated forms of the proxy settings
+                if line.lower().startswith("acquire::%s::proxy " % proxy_type):
                     found = True
                 else:
                     new_content.append(line)