[26857] in Source-Commits
Re: /svn/athena r25795 -
daemon@ATHENA.MIT.EDU (Benjamin Kaduk)
Thu Nov 1 12:04:58 2012
Date: Thu, 1 Nov 2012 12:04:48 -0400 (EDT)
From: Benjamin Kaduk <kaduk@MIT.EDU>
To: Jonathan D Reed <jdreed@MIT.EDU>
cc: source-commits@MIT.EDU
In-Reply-To: <201210312023.q9VKNsam010885@drugstore.mit.edu>
Message-ID: <alpine.GSO.1.10.1211011204460.2164@multics.mit.edu>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
ACK.
-Ben
On Wed, 31 Oct 2012, Jonathan D Reed wrote:
> 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;
> }
>
>
