[SCM] GUI front-end for Debian Live. branch, master, updated. 319b1d690e4a5bd4d3df065fd5ff331421c1059d

[Chris Lamb]

The following commit has been merged in the master branch:
commit a85eaabee792a2b37f712e229254140fd464ad4f
Author: Chris Lamb <lamby at debian.org>
Date:   Sat Oct 18 00:07:35 2008 +0100

    Ignore the debian-multimedia and volatile.debian.org repositories when autodecting repository. (Closes: #502335)
    
    Signed-off-by: Chris Lamb <lamby at debian.org>

diff --git a/DebianLive/utils/sources_list.py b/DebianLive/utils/sources_list.py
index cec6d19..8f62cde 100644
--- a/DebianLive/utils/sources_list.py
+++ b/DebianLive/utils/sources_list.py
@@ -32,6 +32,8 @@ PATTERNS = (
 REJECT_PATTERNS = (
     re.compile(r'backports\.'),
     re.compile(r'security\.'),
+    re.compile(r'debian-multimedia\.'),
+    re.compile(r'volatile\.'),
 )
 
 def get_mirror(fallback='http://www.us.debian.org/', sources_list='/etc/apt/sources.list', defaults='/etc/default/live-helper'):
diff --git a/debian/changelog b/debian/changelog
index c276669..604b82e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 live-magic (1.3) unstable; urgency=low
 
   * Sync option specification with live-helper 1.0.1-1.
+  * Modify mirror auto-detection to ignore the debian-multimedia and
+    volatile.debian.org repositories. (Closes: #502335)
 
- -- Chris Lamb <lamby at debian.org>  Mon, 22 Sep 2008 08:01:07 +0100
+ -- Chris Lamb <lamby at debian.org>  Sat, 18 Oct 2008 00:02:14 +0100
 
 live-magic (1.2) unstable; urgency=low
 
diff --git a/tests/test_sources_list.py b/tests/test_sources_list.py
index 9079028..4dc997d 100755
--- a/tests/test_sources_list.py
+++ b/tests/test_sources_list.py
@@ -79,6 +79,12 @@ class TestNoMatch(TestSourcesList):
     def testBackports(self):
         self.assertNoMatchLine('deb http://backports.debian.org/debian stable main')
 
+    def testVolatile(self):
+        self.assertNoMatchLine('deb http://volatile.debian.org/debian stable main')
+
+    def testMultimedia(self):
+        self.assertNoMatchLine('deb http://www.debian-multimedia.org/debian stable main')
+
 class TestErrors(TestSourcesList):
     def testFileNotFound(self):
         self.failIf(get_mirror(None, sources_list='/proc/invisible-file', defaults=None))

-- 
GUI front-end for Debian Live.