[Secure-testing-commits] r4173 - bin

[Joey Hess]

Author: joeyh
Date: 2006-06-11 02:06:20 +0000 (Sun, 11 Jun 2006)
New Revision: 4173

Modified:
   bin/checklist
   bin/dtsasync
Log:
use dak ls unstead of madison

Modified: bin/checklist
===================================================================
--- bin/checklist	2006-06-10 21:14:31 UTC (rev 4172)
+++ bin/checklist	2006-06-11 02:06:20 UTC (rev 4173)
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# Must run on a machine with madison.
+# Must run on a machine with dak ls.
 # 
 # To check for un-updated binary kernel packages, also needs grep-dctrl 
 # and a Sources file for the distribution. Set the location of the Sources
@@ -161,10 +161,10 @@
 				}
 			}
 
-			# Fire up madison.
+			# Fire up dak ls.
 			my @maddy;
 			for (1..5) {
-				@maddy=`madison -s '$suite' '$package'`;
+				@maddy=`dak ls -s '$suite' '$package'`;
 				if ($? & 127 || ($? >> 8 != 0 && $? >> 8 != 1)) {
 					# good old unrelaible newraff,
 					# home of our archive..
@@ -173,10 +173,10 @@
 				last;
 			}
 			if ($? & 127) {
-				record($package, "<em>[madison segfaulted 5 times in a row.. Medic!]</em>", $id);
+				record($package, "<em>[dak ls segfaulted 5 times in a row.. Medic!]</em>", $id);
 			}
 			elsif ($? >> 8 != 0 && $? >> 8 != 1) {
-				record($package, "<em>[madison exited with ".($? >> 8)."]</em>", $id);
+				record($package, "<em>[dak ls exited with ".($? >> 8)."]</em>", $id);
 			}
 			if (! @maddy) {
 				next;

Modified: bin/dtsasync
===================================================================
--- bin/dtsasync	2006-06-10 21:14:31 UTC (rev 4172)
+++ bin/dtsasync	2006-06-11 02:06:20 UTC (rev 4173)
@@ -25,8 +25,8 @@
 		close KID;
 	}
 	else {
-		exec "madison", "-s", $suite, "-f", "heidi", "-S", $package
-			or die "can't exec madison: $!";
+		exec "dak", "ls", "-s", $suite, "-f", "heidi", "-S", $package
+			or die "can't exec dak ls: $!";
 	}
 
 	return @ret;
@@ -56,7 +56,7 @@
 
 			print "Syncing $sync_package/$sync_version\n";
 			print "Current status:\n";
-			system("madison", "-S", $sync_package);
+			system("dak", "ls", "-S", $sync_package);
 			
 			my @fromlines=getlines($fromsuite, $sync_package);
 			if (! @fromlines) {
@@ -88,7 +88,7 @@
 			close HEIDI || print "$heidicmd exited nonzero!\n";
 			
 			print "New status:\n";
-			system("madison", "-S", $sync_package);
+			system("dak", "ls", "-S", $sync_package);
 			
 			$run_dinstall=1;
 		}