* apt/__init__.py:

  - remove the future warning 
* aptsources/distro.py:
  - fix indent breakage (LP: #319714)

3 files changed, 74 insertions, 66 deletions

diff --git a/apt/__init__.py b/apt/__init__.py
index 05407aff..e3cfacbe 100644
--- a/apt/__init__.py
+++ b/apt/__init__.py
@@ -15,6 +15,6 @@ from apt_pkg import SizeToStr, TimeToStr, VersionCompare
 apt_pkg.init()
 
 
-import warnings
-warnings.warn("apt API not stable yet", FutureWarning)
-del warnings
+#import warnings
+#warnings.warn("apt API not stable yet", FutureWarning)
+#del warnings
diff --git a/aptsources/distro.py b/aptsources/distro.py
index a28396b7..1d958132 100644
--- a/aptsources/distro.py
+++ b/aptsources/distro.py
@@ -78,69 +78,68 @@ class Distribution:
 
         # find the distro template
         for template in self.sourceslist.matcher.templates:
-            if self.is_codename(template.name) and\
-                template.distribution == self.id:
+            if (self.is_codename(template.name) and
+                template.distribution == self.id):
                 #print "yeah! found a template for %s" % self.description
                 #print template.description, template.base_uri, \
                 #    template.components
                 self.source_template = template
                 break
-            if self.source_template is None:
-                raise NoDistroTemplateException("Error: could not find a "
+        if self.source_template is None:
+            raise NoDistroTemplateException("Error: could not find a "
                                                 "distribution template")
 
-            # find main and child sources
-            media = []
-            comps = []
-            cdrom_comps = []
-            enabled_comps = []
-            source_code = []
-            for source in self.sourceslist.list:
-                if source.invalid == False and\
-                   self.is_codename(source.dist) and\
-                   source.template and\
-                   self.is_codename(source.template.name):
-                    #print "yeah! found a distro repo:  %s" % source.line
-                    # cdroms need do be handled differently
-                    if source.uri.startswith("cdrom:") and \
-                       source.disabled == False:
-                        self.cdrom_sources.append(source)
-                        cdrom_comps.extend(source.comps)
-                    elif source.uri.startswith("cdrom:") and \
-                         source.disabled == True:
-                        self.cdrom_sources.append(source)
-                    elif source.type == self.binary_type and \
-                         source.disabled == False:
-                        self.main_sources.append(source)
-                        comps.extend(source.comps)
-                        media.append(source.uri)
-                    elif source.type == self.binary_type and \
-                         source.disabled == True:
-                        self.disabled_sources.append(source)
-                    elif source.type == self.source_type \
-                        and source.disabled == False:
-                        self.source_code_sources.append(source)
-                    elif source.type == self.source_type \
-                        and source.disabled == True:
-                        self.disabled_sources.append(source)
-                if source.invalid == False and\
-                   source.template in self.source_template.children:
-                    if source.disabled == False \
-                        and source.type == self.binary_type:
-                        self.child_sources.append(source)
-                    elif source.disabled == False \
-                        and source.type == self.source_type:
-                        self.source_code_sources.append(source)
-                    else:
-                        self.disabled_sources.append(source)
-            self.download_comps = set(comps)
-            self.cdrom_comps = set(cdrom_comps)
-            enabled_comps.extend(comps)
-            enabled_comps.extend(cdrom_comps)
-            self.enabled_comps = set(enabled_comps)
-            self.used_media = set(media)
-
-            self.get_mirrors()
+        # find main and child sources
+        media = []
+        comps = []
+        cdrom_comps = []
+        enabled_comps = []
+        source_code = []
+        for source in self.sourceslist.list:
+            if (source.invalid == False and
+                self.is_codename(source.dist) and
+                source.template and
+                self.is_codename(source.template.name)):
+                #print "yeah! found a distro repo:  %s" % source.line
+                # cdroms need do be handled differently
+                if (source.uri.startswith("cdrom:") and 
+                    source.disabled == False):
+                    self.cdrom_sources.append(source)
+                    cdrom_comps.extend(source.comps)
+                elif (source.uri.startswith("cdrom:") and 
+                      source.disabled == True):
+                    self.cdrom_sources.append(source)
+                elif (source.type == self.binary_type and 
+                      source.disabled == False):
+                    self.main_sources.append(source)
+                    comps.extend(source.comps)
+                    media.append(source.uri)
+                elif (source.type == self.binary_type and 
+                      source.disabled == True):
+                    self.disabled_sources.append(source)
+                elif (source.type == self.source_type 
+                        and source.disabled == False):
+                    self.source_code_sources.append(source)
+                elif (source.type == self.source_type and
+                      source.disabled == True):
+                    self.disabled_sources.append(source)
+            if (source.invalid == False and
+                source.template in self.source_template.children):
+                if (source.disabled == False 
+                    and source.type == self.binary_type):
+                    self.child_sources.append(source)
+                elif (source.disabled == False 
+                      and source.type == self.source_type):
+                    self.source_code_sources.append(source)
+                else:
+                    self.disabled_sources.append(source)
+        self.download_comps = set(comps)
+        self.cdrom_comps = set(cdrom_comps)
+        enabled_comps.extend(comps)
+        enabled_comps.extend(cdrom_comps)
+        self.enabled_comps = set(enabled_comps)
+        self.used_media = set(media)
+        self.get_mirrors()
 
     def get_mirrors(self, mirror_template=None):
         """
@@ -217,15 +216,15 @@ class Distribution:
         # Store all available servers:
         # Name, URI, active
         mirrors = []
-        if len(self.used_servers) < 1 or \
-           (len(self.used_servers) == 1 and \
-            compare_mirrors(self.used_servers[0], self.main_server)):
+        if (len(self.used_servers) < 1 or 
+            (len(self.used_servers) == 1 and 
+             compare_mirrors(self.used_servers[0], self.main_server))):
             mirrors.append([_("Main server"), self.main_server, True])
             if self.nearest_server:
                 mirrors.append([self._get_mirror_name(self.nearest_server),
                                 self.nearest_server, False])
-        elif len(self.used_servers) == 1 and not \
-             compare_mirrors(self.used_servers[0], self.main_server):
+        elif (len(self.used_servers) == 1 and not 
+              compare_mirrors(self.used_servers[0], self.main_server)):
             mirrors.append([_("Main server"), self.main_server, False])
             # Only one server is used
             server = self.used_servers[0]
@@ -382,8 +381,8 @@ class Distribution:
             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 is None or \
-               source.template.base_uri != source.uri:
+            if (source.template.base_uri is 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)
diff --git a/debian/changelog b/debian/changelog
index a685cfdd..e674ad60 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+python-apt (0.7.9~exp2ubuntu2) jaunty; urgency=low
+
+  * apt/__init__.py:
+    - remove the future warning 
+  * aptsources/distro.py:
+    - fix indent breakage (LP: #319714)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 21 Jan 2009 21:47:21 +0100
+
 python-apt (0.7.9~exp2ubuntu1) jaunty; urgency=low
 
   * Merged from debian, lots of documentation updates