[26844] in Source-Commits
/svn/athena r25789 - trunk/debathena/scripts/build-server/build-all
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Thu Oct 25 11:22:32 2012
Date: Thu, 25 Oct 2012 11:22:25 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201210251522.q9PFMPSM013967@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2012-10-25 11:22:25 -0400 (Thu, 25 Oct 2012)
New Revision: 25789
Modified:
trunk/debathena/scripts/build-server/build-all/Makefile
trunk/debathena/scripts/build-server/build-all/gen-build-deps
Log:
Rebuild quantal
Modified: trunk/debathena/scripts/build-server/build-all/Makefile
===================================================================
--- trunk/debathena/scripts/build-server/build-all/Makefile 2012-10-25 15:10:20 UTC (rev 25788)
+++ trunk/debathena/scripts/build-server/build-all/Makefile 2012-10-25 15:22:25 UTC (rev 25789)
@@ -1,5 +1,5 @@
suite := quantal
-psuite := precise
+psuite := quantal
STAMPS := /afs/sipb.mit.edu/project/debathena/machines/awesome-build-server/stamps.$(suite)
package = $(STAMPS)/$(1).done
Modified: trunk/debathena/scripts/build-server/build-all/gen-build-deps
===================================================================
--- trunk/debathena/scripts/build-server/build-all/gen-build-deps 2012-10-25 15:10:20 UTC (rev 25788)
+++ trunk/debathena/scripts/build-server/build-all/gen-build-deps 2012-10-25 15:22:25 UTC (rev 25789)
@@ -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 source-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;
}
