Pre-emptively remove occurances of the short name of the Debian derivative from Canonical that cannot be named.

3 files changed, 17 insertions, 7 deletions

diff --git a/debian/NEWS b/debian/NEWS
index d72589a..b5d5604 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -157,7 +157,8 @@ debmirror (20060907) unstable; urgency=low
     combination of arch, suite and section that does not exist locally
     and is not listed in the Release file for the suite. This
     obsoletes the previously hardcoded exceptions and should allow to
-    mirror unknown archives like Ubuntu without problems.
+    mirror unknown archives like the Debian derivative from Canonical that
+    cannot be named without problems.
 
     Note that debmirror will fail when a combination of arch, suite
     and section that exists locally gets dropped from the Release
diff --git a/debian/changelog b/debian/changelog
index 98a5953..90ebdfa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debmirror (1:2.17) UNRELEASED; urgency=low
+
+  * Pre-emptively remove occurances of the short name of the
+    Debian derivative from Canonical that cannot be named.
+
+ -- Joey Hess <joeyh@debian.org>  Fri, 08 Nov 2013 11:35:59 -0400
+
 debmirror (1:2.16) unstable; urgency=low
 
   * Fix confusing output with --precleanup.
@@ -15,7 +22,8 @@ debmirror (1:2.15) unstable; urgency=low
   * Add --exclude-field and --include-field options.
     Closes: #695767. Thanks, Colin Watson
   * Supports https. Closes: #697687 Thanks, Fernando Ike
-  * Treat "Origin: Canonical" like "Origin: Ubuntu"
+  * Fix bug dealing with the Debian derivative from Canonical which cannot be
+    named.
     Closes: #702319. Thanks, Tal Danzig
 
  -- Joey Hess <joeyh@debian.org>  Sat, 04 May 2013 23:44:27 -0400
@@ -249,7 +257,8 @@ debmirror (1:2.1) unstable; urgency=low
     the mirror: trace files, ./doc, ./indices and ./tools. The transfer
     method used for this is always rsync, irrespective of what method is
     specified in the --method option. Closes: #153680, #156564.
-  * Ubuntu uses an identical Codename for different suites, so just ignore
+  * The Debian derivative from Canonical which cannot be named 
+    uses an identical Codename for different suites, so just ignore
     it and use the Suite instead. Closes: #544132.
 
  -- Frans Pop <fjp@debian.org>  Sat, 29 Aug 2009 18:55:25 +0200
diff --git a/debmirror b/debmirror
index 0c2543c..65e9a84 100755
--- a/debmirror
+++ b/debmirror
@@ -2116,13 +2116,13 @@ sub name_release {
 
   if ($origin eq "none") {
     $codename = $dist_raw;
-  } elsif ($origin eq "Ubuntu" or $origin eq "Canonical") {
+  } elsif ($origin=~/^[U][b][u][n][t][u]$/ or $origin eq "Canonical") {
     if ($suite) {
-      say("Ubuntu Release file: using Suite ($suite).");
+      say("Debian derivative from Canonical which cannot be named Release file: using Suite ($suite).");
       $codename = $suite;
     } else {
-      say("Invalid Ubuntu Release file.");
-      push (@errlog,"Invalid Ubuntu Release file.\n");
+      say("Invalid Debian derivative from Canonical which cannot be named Release file.");
+      push (@errlog,"Invalid Debian derivative from Canonical which cannot be named Release file.\n");
       $num_errors++;
       next;
     }