[Piuparts-commits] rev 110 - / trunk

[Lars Wirzenius]

Author: lars
Date: 2007-12-07 17:46:27 +0000 (Fri, 07 Dec 2007)
New Revision: 110

Modified:
   /
   trunk/piuparts.py
Log:
Make list of components that gets used when only specifying the URL of a mirror use the default list specific to the flavor of Debian being used, instead of the list specific for Debian.


Property changes on: 
___________________________________________________________________
Name: bzr:revision-info
   - timestamp: 2007-11-29 22:07:14.901999950 +0200
committer: Lars Wirzenius <liw at iki.fi>
properties: 
	branch-nick: piuparts.tmp

   + timestamp: 2007-12-07 19:46:15.453000069 +0200
committer: Lars Wirzenius <liw at iki.fi>
properties: 
	branch-nick: piuparts.upstream

Name: bzr:revision-id:v3-none
   - 104 liw at iki.fi-20071105202024-ahct8ts13awaqfku
105 liw at iki.fi-20071105212653-ttr3062izcfvnyj7
106 liw at iki.fi-20071105212929-y8o8937i99hqouad
107 liw at iki.fi-20071108202016-kb4x591yu6kxbt03
108 liw at iki.fi-20071108203319-yn2spqgvngjw0ydc
109 liw at iki.fi-20071108205411-ztzieylautujrbet
110 liw at iki.fi-20071129200714-xtqnfccm1rjof5e7

   + 104 liw at iki.fi-20071105202024-ahct8ts13awaqfku
105 liw at iki.fi-20071105212653-ttr3062izcfvnyj7
106 liw at iki.fi-20071105212929-y8o8937i99hqouad
107 liw at iki.fi-20071108202016-kb4x591yu6kxbt03
108 liw at iki.fi-20071108203319-yn2spqgvngjw0ydc
109 liw at iki.fi-20071108205411-ztzieylautujrbet
110 liw at iki.fi-20071129200714-xtqnfccm1rjof5e7
111 liw at iki.fi-20071207174615-4wey2v30mft1p9ak


Modified: trunk/piuparts.py
===================================================================
--- trunk/piuparts.py	2007-11-29 20:08:09 UTC (rev 109)
+++ trunk/piuparts.py	2007-12-07 17:46:27 UTC (rev 110)
@@ -62,6 +62,9 @@
     
     """
 
+    def get_components(self):
+        """Return list of default components for a mirror."""
+
     def get_mirror(self):
         """Return default mirror."""
     
@@ -71,9 +74,11 @@
 
 class DebianDefaults(Defaults):
 
+    def get_components(self):
+        return ["main", "contrib", "non-free"]
+
     def get_mirror(self):
-        return [("http://ftp.debian.org/debian",
-                 ["main", "contrib", "non-free"])]
+        return [("http://ftp.debian.org/debian", self.get_components())]
 
     def get_distribution(self):
         return ["sid"]
@@ -81,9 +86,11 @@
 
 class UbuntuDefaults(Defaults):
 
+    def get_components(self):
+        return ["main", "universe", "restricted", "multiverse"]
+
     def get_mirror(self):
-        return [("http://archive.ubuntu.com/ubuntu",
-                 ["main", "universe", "restricted", "multiverse"])]
+        return [("http://archive.ubuntu.com/ubuntu", self.get_components())]
 
     def get_distribution(self):
         return ["gutsy"]
@@ -1404,10 +1411,10 @@
     settings.no_upgrade_test = opts.no_upgrade_test
     settings.skip_cronfiles_test = opts.skip_cronfiles_test
     log_file_name = opts.log_file
-    settings.debian_mirrors = [parse_mirror_spec(x, 
-                                                 ["main", 
-                                                  "contrib", 
-                                                  "non-free"]) 
+
+    defaults = DefaultsFactory().new_defaults()
+    
+    settings.debian_mirrors = [parse_mirror_spec(x, defaults.get_components())
                                for x in opts.mirror]
     settings.check_broken_symlinks = not opts.no_symlinks
     settings.savetgz = opts.save
@@ -1437,8 +1444,6 @@
                           settings.scriptsdir)
             panic()
 
-    defaults = DefaultsFactory().new_defaults()
-    
     if not settings.debian_distros:
         settings.debian_distros = defaults.get_distribution()