diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2014-08-03 17:30:03 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2014-08-03 17:31:50 +0100 |
commit | 4fd22956f74ec637545137e7fa25b5dbf03585c0 (patch) | |
tree | afde4acea6dffabd4496fd5680d4469631aeab28 | |
parent | 2f62e59376dcfddcaeff1826f5de91041336a239 (diff) |
Work with wheezy-backports (and keep squeeze-backports working too). Closes:#736524.
-rw-r--r-- | debian/changelog | 2 | ||||
-rwxr-xr-x | dgit | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 6ccbdde..bd08454 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ dgit (0.22~experimental1) experimental; urgency=low Bugfixes: * Clone removes destination directory on error. Closes:#736153. + * Work with wheezy-backports (and keep squeeze-backports working too). + Closes:#736524. Minor improvements: * Include canonicalised suite name in signed tag message. @@ -469,7 +469,7 @@ our %defcfg = ('dgit.default.distro' => 'debian', 'dgit-distro.debian.sshpsql-dbname' => 'service=projectb', 'dgit-distro.debian.upload-host' => 'ftp-master', # for dput 'dgit-distro.debian.mirror' => 'http://ftp.debian.org/debian/', - 'dgit-distro.debian.backports-quirk' => '%-backports*', + 'dgit-distro.debian.backports-quirk' => '(squeeze)-backports*', 'dgit-distro.debian-backports.mirror' => 'http://backports.debian.org/debian-backports/', 'dgit-distro.test-dummy.ssh' => "$td/ssh", 'dgit-distro.test-dummy.username' => "alice", @@ -515,9 +515,10 @@ sub access_quirk () { 'RETURN-UNDEF'); if (defined $backports_quirk) { my $re = $backports_quirk; - $re =~ s/[^-0-9a-z_\%*]/\\$&/ig; + $re =~ s/[^-0-9a-z_\%*()]/\\$&/ig; $re =~ s/\*/.*/g; - $re =~ s/\%/([-0-9a-z_]+)/ or badcfg "backports-quirk needs \%"; + $re =~ s/\%/([-0-9a-z_]+)/ + or $re =~ m/[()]/ or badcfg "backports-quirk needs \% or ( )"; if ($isuite =~ m/^$re$/) { return ('backports',"$basedistro-backports",$1); } |