From: Julien Cristau <jcristau@debian.org>
Date: Mon, 14 Mar 2011 21:48:57 +0000 (+0100)
Subject: byhand-di: allow YYYYMMDD+<suite>x version numbers
X-Git-Url: https://git.decadent.org.uk/gitweb/?p=dak.git;a=commitdiff_plain;h=904ac9b520fb3a9449a42f7f26e71c372789227d

byhand-di: allow YYYYMMDD+<suite>x version numbers

To: debian-dak@lists.debian.org
Cc: Julien Cristau <jcristau@debian.org>, Otavio Salvador <otavio@ossystems.com.br>
Date: Mon, 14 Mar 2011 14:11:39 +0100
X-Spam-Status: No, score=-1.775 tagged_above=-99 required=4.6 tests=[BAYES_00=-1.9, SARE_SUB_OBFU_OTHER=0.135, T_RP_MATCHES_RCVD=-0.01] autolearn=no
X-Mailer: git-send-email 1.7.2.5
Resent-From: debian-dak@lists.debian.org

stable updates need to have a higher version than binNMUs, but
YYYYMMDD<suite>x << YYYYMMDD+b1.

Signed-off-by: Julien Cristau <jcristau@debian.org>
Cc: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Joerg Jaspert <joerg@debian.org>
---

diff --git a/scripts/debian/byhand-di b/scripts/debian/byhand-di
index 9e1b0512..99cb3131 100755
--- a/scripts/debian/byhand-di
+++ b/scripts/debian/byhand-di
@@ -19,8 +19,8 @@ error() {
 }
 
 # Check validity of version number
-# Expected are: YYYYMMDD, YYYYMMDD.x, YYYYMMDD<suite>x and the +b[0-9] on the end
-if ! echo "$VERSION" | grep -Eq "^[0-9]{8}(|(\.|[a-z]+)[0-9]+)(\+b[0-9])?$"; then
+# Expected are: YYYYMMDD, YYYYMMDD.x, YYYYMMDD<suite>x, YYYYMMDD+<suite>x and the +b[0-9] on the end
+if ! echo "$VERSION" | grep -Eq "^[0-9]{8}(|(\.|\+?[a-z]+)[0-9]+)(\+b[0-9])?$"; then
 	error "Invalid version: '$VERSION'"
 fi