From 48c981db5adea85ed38acf7fca0e63f5ae5b1b97 Mon Sep 17 00:00:00 2001
From: Sebastian Heinlein <sebi@sebi-laptop>
Date: Sun, 26 Nov 2006 23:19:52 +0100
Subject: * fix the mirrors of child sources * fix the test output of DistUtils

---
 AptSources/DistInfo.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'AptSources/DistInfo.py')

diff --git a/AptSources/DistInfo.py b/AptSources/DistInfo.py
index 2dbd9a1b..41edd75c 100644
--- a/AptSources/DistInfo.py
+++ b/AptSources/DistInfo.py
@@ -102,7 +102,7 @@ class DistInfo:
                         # reuse some properties of the parent suite
                         if suite.match_uri == None:
                             suite.match_uri = nanny.match_uri
-                        if suite.valid_mirrors == None:
+                        if suite.valid_mirrors == []:
                             suite.valid_mirrors = nanny.valid_mirrors
                         if suite.base_uri == None:
                             suite.base_uri = nanny.base_uri
@@ -148,7 +148,7 @@ class DistInfo:
 
 
 if __name__ == "__main__":
-    d = DistInfo ("Ubuntu", "../../data/templates")
+    d = DistInfo ("Ubuntu", "/usr/share/python-aptsources/templates")
     print d.changelogs_uri
     for suite in d.suites:
         print "\nSuite: %s" % suite.name
@@ -157,7 +157,7 @@ if __name__ == "__main__":
         print "MatchURI: %s" % suite.match_uri
         print "Mirrors: %s" % suite.valid_mirrors
         for component in suite.components:
-            print "  %s - %s - %s - %s" % (component, 
+            print "  %s - %s - %s" % (component, 
                                        suite.components[component][0],
                                        suite.components[component][1])
         for child in suite.children:
-- 
cgit v1.2.3


From 0707e8fce07af2ff9a81406b32dd618e59fb42f6 Mon Sep 17 00:00:00 2001
From: Sebastian Heinlein <sebi@sebi-laptop>
Date: Thu, 30 Nov 2006 22:41:02 +0100
Subject: * add get_comp_desc which returns a nice description for a component 
  of a template

---
 AptSources/DistInfo.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'AptSources/DistInfo.py')

diff --git a/AptSources/DistInfo.py b/AptSources/DistInfo.py
index 41edd75c..6387dbd2 100644
--- a/AptSources/DistInfo.py
+++ b/AptSources/DistInfo.py
@@ -43,6 +43,17 @@ class Suite:
         self.distribution = None
         self.available = True
 
+    def get_comp_desc(self, comp, short=False):
+        ''' Return a human readable description of a component '''
+        if self.components.has_key(comp):
+            if self.components[comp][1] == "" or short == True:
+                return self.components[comp][0]
+            elif self.components[comp][1] != "":
+                return self.components[comp][1]
+            else:
+                return "Unnamed component"
+        return None
+
 class Component:
     def __init__(self):
         self.name = ""
-- 
cgit v1.2.3