[23296] in Source-Commits

home help back first fref pref prev next nref lref last post

/svn/athena r22955 - trunk/debathena/scripts/build-server/build-all

daemon@ATHENA.MIT.EDU (ghudson@MIT.EDU)
Thu May 1 13:10:48 2008

Date: Thu, 1 May 2008 13:09:29 -0400 (EDT)
From: ghudson@MIT.EDU
Message-Id: <200805011709.NAA23038@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Author: ghudson
Date: 2008-05-01 13:09:28 -0400 (Thu, 01 May 2008)
New Revision: 22955

Modified:
   trunk/debathena/scripts/build-server/build-all/gen-build-deps
Log:
In build-all's gen-build-deps, split the build-depends line into
fields before performing substitutions which rely on the end of the
string.


Modified: trunk/debathena/scripts/build-server/build-all/gen-build-deps
===================================================================
--- trunk/debathena/scripts/build-server/build-all/gen-build-deps	2008-05-01 16:47:37 UTC (rev 22954)
+++ trunk/debathena/scripts/build-server/build-all/gen-build-deps	2008-05-01 17:09:28 UTC (rev 22955)
@@ -9,10 +9,13 @@
 
 sub list {
 	my ($l) = @_;
-	$l =~ s/ \(.*\)$//;
-	$l =~ s/ \|.*$//;
-	$l =~ s/ \[.*$//;
-	split(/, /, $l);
+	my @a = split(/, /, $l);
+	foreach (@a) {
+	    s/ \(.*\)$//;
+	    s/ \|.*$//;
+	    s/ \[.*$//;
+	}
+	return @a;
 }
 
 open(DPKG, '-|', "zcat $ENV{DEBATHENA_APT}/dists/$psuite/*/source/Sources.gz | dpkg-awk -f - -- Package Build-Depends") or die;


home help back first fref pref prev next nref lref last post