Work with wheezy-backports (and keep squeeze-backports working too). Closes:#736524.

diff --git a/debian/changelog b/debian/changelog
index 6ccbdde8d2a351c4cf42f52669085cbe4dda38f2..bd08454e7ebf36618d1ab6c0bcc5c0d8e5e9dacb 100644 (file)
--- 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.

diff --git a/dgit b/dgit
index 42fa30688d3d81d1bc36ff98c80900e4719a7153..4b218a3b2c8d46870a8691444f03c90b8610e554 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -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);
        }