* handle the change of child repo servers in a more sane way - fix

LP#85060

2 files changed, 6 insertions, 6 deletions

diff --git a/aptsources/distinfo.py b/aptsources/distinfo.py
index 674c1bf5..fdd063a5 100644
--- a/aptsources/distinfo.py
+++ b/aptsources/distinfo.py
@@ -181,8 +181,6 @@ class DistInfo:
                             template.match_uri = nanny.match_uri
                         if template.mirror_set == {}:
                             template.mirror_set = nanny.mirror_set
-                        if template.base_uri == None:
-                            template.base_uri = nanny.base_uri
             elif field == 'Available':
                 template.available = value
             elif field == 'RepositoryType':
diff --git a/aptsources/distro.py b/aptsources/distro.py
index a5210ace..9d3b4105 100644
--- a/aptsources/distro.py
+++ b/aptsources/distro.py
@@ -267,11 +267,13 @@ class Distribution:
     seen_binary = []
     seen_source = []
     self.default_server = uri
-    sources = []
-    sources.extend(self.main_sources)
-    sources.extend(self.child_sources)
-    for source in sources:
+    for source in self.main_sources:
         change_server_of_source(source, uri, seen_binary)
+    for source in self.child_sources:
+        # Do not change the forces server of a child source
+        if source.template.base_uri == None or \
+           source.template.base_uri != source.uri:
+            change_server_of_source(source, uri, seen_binary)
     for source in self.source_code_sources:
         change_server_of_source(source, uri, seen_source)