[26853] in Source-Commits

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

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

daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Wed Oct 31 16:24:01 2012

Date: Wed, 31 Oct 2012 16:23:54 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201210312023.q9VKNsam010885@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Author: jdreed
Date: 2012-10-31 16:23:54 -0400 (Wed, 31 Oct 2012)
New Revision: 25795

Modified:
   trunk/debathena/scripts/build-server/build-all/gen-build-deps
Log:
Enable debugging info to stderr if DEBATHENA_DEBUG is set

Modified: trunk/debathena/scripts/build-server/build-all/gen-build-deps
===================================================================
--- trunk/debathena/scripts/build-server/build-all/gen-build-deps	2012-10-31 20:06:45 UTC (rev 25794)
+++ trunk/debathena/scripts/build-server/build-all/gen-build-deps	2012-10-31 20:23:54 UTC (rev 25795)
@@ -7,6 +7,14 @@
 $psuite or die "Usage: gen-build-deps <previous suite name>";
 $ENV{DEBATHENA_APT} or $ENV{DEBATHENA_APT}="/mit/debathena/apt";
 
+my $debugmode = $ENV{DEBATHENA_DEBUG} ? 1 : 0;
+
+sub debug {
+    if ($debugmode) {
+	print STDERR "D: ", @_, "\n";
+    }
+}
+
 sub list {
 	my ($l) = @_;
 	my @a = split(/, /, $l);
@@ -24,11 +32,15 @@
 while (<DPKG>) {
 	last if /^$/;
 	my ($source) = /^Package: (.*)$/ or die;
+	debug("Examining $source");
 	@{$src_deps{$source}} = ();
 	while (<DPKG>) {
 		last if ($_ eq "\n");
 		if (my ($depends) = /^Build-Depends: (.*)$/) {
-			push @{$src_deps{$source}}, $_ for (list($depends));
+		    for (list($depends)) {
+			debug("  Adding $_ as build-dep of $source");
+			push @{$src_deps{$source}}, $_ ;
+		    }
 		} else {
 			die;
 		}
@@ -47,17 +59,26 @@
 while (<DPKG>) {
 	last if /^$/;
 	my ($package) = /^Package: (.*)$/ or die;
+	debug("Examining binary package $package");
 	$pkg_src{$package} = $package;
 	$pkg_provider{$package} = $package;
+	debug("Setting src and provider to itself");
 	@{$pkg_deps{$package}} = ();
 	while (<DPKG>) {
 		last if ($_ eq "\n");
 		if (my ($source) = /^Source: (.*)$/) {
 			$pkg_src{$package} = $source;
+			debug("  Changing src to $source");
 		} elsif (my ($provides) = /^Provides: (.*)$/) {
-			$pkg_provider{$_} = $package for (list($provides));
+		    for (list($provides)) {
+			$pkg_provider{$_} = $package;
+			debug("  Adding $package as a provider of $_");
+		    }
 		} elsif (my ($depends) = /^Depends: (.*)$/) {
-			push @{$pkg_deps{$package}}, $_ for (list($depends));
+			for (list($depends)) {
+			    push @{$pkg_deps{$package}}, $_;
+			    debug("--Adding $_ to dependencies of $package");
+			}
 		} else {
 			die;
 		}


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