[PATCH] The Architecture field can contain multiple values
John Wright
john.wright at hp.com
Thu Jul 2 01:09:26 UTC 2009
The regular expression for parsing the Architecture field in Sources
assumed it would only be one word. Since it can be a list of supported
architectures, this patch changes the regular expression to use '.+'
instead of '\S+'.
---
lib/WannaBuild/Database.pm | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/lib/WannaBuild/Database.pm b/lib/WannaBuild/Database.pm
index 6f3abfb..8f63124 100644
--- a/lib/WannaBuild/Database.pm
+++ b/lib/WannaBuild/Database.pm
@@ -1065,7 +1065,7 @@ sub parse_sources {
s/\s*$//m;
/^Package:\s*(\S+)$/mi and $name = $1;
/^Version:\s*(\S+)$/mi and $version = $1;
- /^Architecture:\s*(\S+)$/mi and $arch = $1;
+ /^Architecture:\s*(.+)$/mi and $arch = $1;
/^Section:\s*(\S+)$/mi and $section = $1;
/^Priority:\s*(\S+)$/mi and $priority = $1;
/^Build-Depends:\s*(.*)$/mi and $builddep = $1;
--
debian.1.6.3.3.1.7.g944a7
--C7zPtVaVf+AK4Oqc--
------------=_1249215311-29478-0
Content-Type: message/rfc822
Content-Disposition: inline
Content-Transfer-Encoding: 7bit
Received: (at 535415-close) by bugs.debian.org; 2 Aug 2009 12:13:40 +0000
X-Spam-Checker-Version: SpamAssassin 3.2.3-bugs.debian.org_2005_01_02
(2007-08-08) on rietz.debian.org
X-Spam-Level:
X-Spam-Bayes: score:0.0000 Tokens: new, 76; hammy, 150; neutral, 137; spammy,
1. spammytokens:0.995-1--Deb hammytokens:0.000-+--HX-Debian:DAK,
0.000-+--H*RU:128.148.34.103, 0.000-+--H*rp:D*ftp-master.debian.org,
0.000-+--ftpmaster at debian.org, 0.000-+--UD:diff.gz
X-Spam-Status: No, score=-14.5 required=4.0 tests=AWL,BAYES_00,FROMDEVELOPER,
FVGT_m_MULTI_ODD,HAS_BUG_NUMBER,HEADER_X_KATIE,IMPRONONCABLE_2,
MURPHY_DRUGS_REL8,MURPHY_WRONG_WORD1,MURPHY_WRONG_WORD2,PGPSIGNATURE
autolearn=ham version=3.2.3-bugs.debian.org_2005_01_02
Return-path: <envelope at ftp-master.debian.org>
Received: from ries.debian.org ([128.148.34.103])
by rietz.debian.org with esmtp (Exim 4.63)
(envelope-from <envelope at ftp-master.debian.org>)
id 1MXZwa-0005xa-IX
for 535415-close at bugs.debian.org; Sun, 02 Aug 2009 12:13:40 +0000
Received: from dak by ries.debian.org with local (Exim 4.69)
(envelope-from <envelope at ftp-master.debian.org>)
id 1MXZX5-0001BV-7x; Sun, 02 Aug 2009 11:47:19 +0000
From: Roger Leigh <rleigh at debian.org>
To: 535415-close at bugs.debian.org
X-DAK: dak process-unchecked
X-Katie: $Revision: 1.65 $
X-Debian: DAK
X-Debian-Package: sbuild
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
Subject: Bug#535415: fixed in sbuild 0.59.0-1
Message-Id: <E1MXZX5-0001BV-7x at ries.debian.org>
Sender: Archive Administrator <dak at ries.debian.org>
Date: Sun, 02 Aug 2009 11:47:19 +0000
Source: sbuild
Source-Version: 0.59.0-1
We believe that the bug you reported is fixed in the latest version of
sbuild, which is due to be installed in the Debian FTP archive:
buildd_0.59.0-1_all.deb
to pool/main/s/sbuild/buildd_0.59.0-1_all.deb
libsbuild-perl_0.59.0-1_all.deb
to pool/main/s/sbuild/libsbuild-perl_0.59.0-1_all.deb
sbuild_0.59.0-1.diff.gz
to pool/main/s/sbuild/sbuild_0.59.0-1.diff.gz
sbuild_0.59.0-1.dsc
to pool/main/s/sbuild/sbuild_0.59.0-1.dsc
sbuild_0.59.0-1_all.deb
to pool/main/s/sbuild/sbuild_0.59.0-1_all.deb
sbuild_0.59.0.orig.tar.gz
to pool/main/s/sbuild/sbuild_0.59.0.orig.tar.gz
wanna-build_0.59.0-1_all.deb
to pool/main/s/sbuild/wanna-build_0.59.0-1_all.deb
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 535415 at bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Roger Leigh <rleigh at debian.org> (supplier of updated sbuild package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster at debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: RIPEMD160
Format: 1.8
Date: Sun, 02 Aug 2009 11:15:26 +0100
Source: sbuild
Binary: libsbuild-perl sbuild wanna-build buildd
Architecture: source all
Version: 0.59.0-1
Distribution: unstable
Urgency: low
Maintainer: Debian buildd-tools Developers <buildd-tools-devel at lists.alioth.debian.org>
Changed-By: Roger Leigh <rleigh at debian.org>
Description:
buildd - Daemon for automatically building Debian binary packages from Deb
libsbuild-perl - Tool for building Debian binary packages from Debian sources
sbuild - Tool for building Debian binary packages from Debian sources
wanna-build - Database to track building of Debian binary packages from Debian
Closes: 501230 521486 535415 539570
Changes:
sbuild (0.59.0-1) unstable; urgency=low
.
[ Roger Leigh ]
* New release.
* Use version comparison functions in WannaBuild::Database
(Closes: #521486). Thanks to Florian Weimer.
* WannaBuild::Database: Allow whitespace in Architecture field
(Closes: #535415). Thanks to John Wright for this patch.
* Sbuild::Build, WannaBuild::Database: Add support for architecture
aliases/wildcards (Closes: #501230). Thanks to Andres Mejia for
these patches.
* Sbuild::Conf doesn't require STATS_DIR to exist, and
Sbuild::Build::write_stats only uses STATS_DIR in batch mode
(Closes: #539570).
Checksums-Sha1:
d530a436576506f1f62790ca2af73a679b509d90 1264 sbuild_0.59.0-1.dsc
2018dbe543e727f0e771d89c4ab608519a2bcd88 441867 sbuild_0.59.0.orig.tar.gz
a0a542ee890b093c950ad7488f5db6375864ae0c 20 sbuild_0.59.0-1.diff.gz
5ec7109e93b79a41c78043b0dca4036da2de3f83 179308 libsbuild-perl_0.59.0-1_all.deb
81ecc04050c59503040be19eb73c881da6423673 182734 sbuild_0.59.0-1_all.deb
17d0cce1a1d7378b48660119fb0665a73f7d0f18 189182 wanna-build_0.59.0-1_all.deb
a75100e631134dd088bee1b7a6ec32da85e1548e 176034 buildd_0.59.0-1_all.deb
Checksums-Sha256:
7088b384e7c96d2375ef39a384306deda543a105860447b83eeff9f6e54246bb 1264 sbuild_0.59.0-1.dsc
3b9cd1803ae630b851b15e263b9b30d7089814219a58bcf1c29a5a492bae343a 441867 sbuild_0.59.0.orig.tar.gz
6ea50bb1b67217b267cc918ff11b0e9a12250aec2745c494c20fe866d9099741 20 sbuild_0.59.0-1.diff.gz
5a30b6ea92af9f5b4ef241e404d07736ded2f363b2379fc4cc269fc8ff52a863 179308 libsbuild-perl_0.59.0-1_all.deb
97e9e281bf82fea5ac208e2bf67fa83193e4d9485817f3f364cefc76c6f30449 182734 sbuild_0.59.0-1_all.deb
b4b5d94c44eb6014280e05754d8acac802a2cbbba8cb800d2a072ce7daaded1c 189182 wanna-build_0.59.0-1_all.deb
84c9193463e59d74e25cbbcb61f3b1537a967de687a378d5a12eef9e8babebc5 176034 buildd_0.59.0-1_all.deb
Files:
1e591504c07c0bd90c09de34cec2ad1a 1264 devel extra sbuild_0.59.0-1.dsc
b8c991364e501ab3f70e25ed1ff0b34d 441867 devel extra sbuild_0.59.0.orig.tar.gz
754b5fa0828d7a839eabe27c5529acdc 20 devel extra sbuild_0.59.0-1.diff.gz
f924e1f65b58a8017f4ef767e1281aec 179308 perl extra libsbuild-perl_0.59.0-1_all.deb
ac401670ea06779b2c30cd021ca368ec 182734 devel extra sbuild_0.59.0-1_all.deb
c1be5410fd227b6004a26f4e7f99823d 189182 devel extra wanna-build_0.59.0-1_all.deb
12fe000c3000296bb23e5f5e52a99a0c 176034 devel extra buildd_0.59.0-1_all.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
iEYEAREDAAYFAkp1eTcACgkQVcFcaSW/uEhf1QCg63Zfmi4eMb39jXb3UoEb08Gu
qiIAnizuVKuQhXVdA/dGGT/XzQHYJN6u
=zS1+
-----END PGP SIGNATURE-----
------------=_1249215311-29478-0--
More information about the Buildd-tools-devel
mailing list