summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2013-04-03 22:56:04 -0400
committerJoey Hess <joey@kitenet.net>2013-04-03 22:56:04 -0400
commitdf4065ccbb533ba3da9fa4a6b4f009c2d9a6fffc (patch)
tree6c05c1d31b5dca950946f3eed751c5af3d5518f9
parent7630d2ff3c32833487ba5354dac70cb41d76eb68 (diff)
Treat "Origin: Canonical" like "Origin: Ubuntu" Closes: #702319. Thanks, Tal Danzig
-rw-r--r--debian/changelog2
-rwxr-xr-xdebmirror2
2 files changed, 3 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 850bd03..500fa4f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ debmirror (1:2.15) UNRELEASED; 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"
+ Closes: #702319. Thanks, Tal Danzig
-- Joey Hess <joeyh@debian.org> Fri, 12 Oct 2012 13:49:51 -0400
diff --git a/debmirror b/debmirror
index b0614bc..ca9abd6 100755
--- a/debmirror
+++ b/debmirror
@@ -2102,7 +2102,7 @@ sub name_release {
if ($origin eq "none") {
$codename = $dist_raw;
- } elsif ($origin eq "Ubuntu") {
+ } elsif ($origin eq "Ubuntu" or $origin eq "Canonical") {
if ($suite) {
say("Ubuntu Release file: using Suite ($suite).");
$codename = $suite;