[Buildd-tools-devel] [sbuild patch] buildd-tools changes for merging (11) Remove $chroot_apt_op

[Roger Leigh]

Dear Ryan,

I have attached another small patch which I would be grateful if you
would consider merging in addition to the previous 10 patches:

sbuild-11-aptoptions.diff
        $schroot_apt_op appears to be used interchangably with
        $chroot_apt_options, but is not the same.  In all cases, the
        log message uses $schroot_apt_op, and the actual invocation
        $chroot_apt_options, which makes it look like $schroot_apt_op
        was previously deprecated in favour of $chroot_apt_options.
        The patch completely removes $schroot_apt_op in favour of
        $chroot_apt_options.

The second patch is the patch I have applied to the buildd-tools CVS
for your reference; it's the same as the first, but won't apply to
your SVN repo.


Many thanks,
Roger

-- 
Roger Leigh
                Printing on GNU/Linux?  http://gutenprint.sourceforge.net/
                Debian GNU/Linux        http://www.debian.org/
                GPG Public Key: 0x25BFB848.  Please sign and encrypt your mail.

- --=-=-Content-Type: text/x-patch
Content-Disposition: inline; filename=sbuild-11-aptoptions.diff
Content-Transfer-Encoding: quoted-printable
Content-Description: sbuild-11-aptoptions

Index: sbuild
===================================================================
--- sbuild	(revision 93)
+++ sbuild	(working copy)
@@ -261,7 +261,6 @@
 			" -o Dir::Etc=$absroot/etc/apt";
 		}
 	}
-	$main::chroot_apt_op = '$CHROOT_OPTIONS';
 } elsif ($conf::chroot_only) {
 	die "chroot not found and in chroot only mode -- exiting\n";
 }
@@ -1324,7 +1323,7 @@
 	@$rem_ret = ();
 	return 1 if !@to_install;
   repeat:
-	print PLOG "  $conf::sudo $conf::apt_get --purge $main::chroot_apt_op -q $mode install @to_install\n"
+	print PLOG "  $conf::sudo $conf::apt_get --purge $main::chroot_apt_options -q $mode install @to_install\n"
 		if $mode ne "-s";
 	$msgs = "";
 	# redirection of stdin from /dev/null so that conffile question are
@@ -1345,7 +1344,7 @@
 	$status = $?;
 
 	if ($status != 0 && $msgs =~ /^E: Packages file \S+ (has changed|is out of sync)/mi) {
-		print PLOG "$conf::sudo $conf::apt_get $main::chroot_apt_op -q update\n";
+		print PLOG "$conf::sudo $conf::apt_get $main::chroot_apt_options -q update\n";
 		if (!open( PIPE, "$conf::sudo $conf::apt_get $main::chroot_apt_options -q update 2>&1 |" )) {
 			print PLOG "Can't open pipe to apt-get: $!\n";
 			return 0;
@@ -2127,7 +2126,7 @@
 	my %deps;
 	
 	open( PIPE, "$conf::apt_cache $main::chroot_apt_options show @_ 2>&1 |" )
-		or die "Cannot start $conf::apt_cache $main::chroot_apt_op: $!\n";
+		or die "Cannot start $conf::apt_cache $main::chroot_apt_options: $!\n";
 	local($/) = "";
 	while( <PIPE> ) {
 		my ($name, $dep, $predep);
@@ -2149,7 +2148,7 @@
 	local(*PIPE);
 
 	open( PIPE, "$conf::apt_cache $main::chroot_apt_options showpkg @_ 2>&1 |" )
-		or die "Cannot start $conf::apt_cache $main::chroot_apt_op: $!\n";
+		or die "Cannot start $conf::apt_cache $main::chroot_apt_options: $!\n";
 	my $name;
 	my $in_rprov = 0;
 	my %provided_by;

- --=-=-Content-Type: text/x-patch
Content-Disposition: inline; filename=sbuild-apt-options1.diff
Content-Transfer-Encoding: quoted-printable
Content-Description: Patch applied to buildd-tools CVS

Index: sbuild
===================================================================
RCS file: /cvsroot/buildd-tools/sbuild/sbuild,v
retrieving revision 1.56
diff -u -r1.56 sbuild
--- sbuild	1 Feb 2006 22:07:57 -0000	1.56
+++ sbuild	11 Feb 2006 16:52:11 -0000
@@ -1412,7 +1412,7 @@
 		print PLOG "  $conf::schroot -c $main::distribution -u root $conf::schroot_options -- $conf::apt_get --purge -q $mode install @to_install\n"
 		    if $mode ne "-s";
 	} else {
-		print PLOG "  $conf::sudo $conf::apt_get --purge $main::chroot_apt_op - -q $mode install @to_install\n"
+		print PLOG "  $conf::sudo $conf::apt_get --purge $main::chroot_apt_options -q $mode install @to_install\n"
 		    if $mode ne "-s";
 	}
 	$msgs = "";
@@ -1450,7 +1450,7 @@
 				return 0;
 			}
 		} else {
-			print PLOG "$conf::sudo $conf::apt_get $main::chroot_apt_op -q update\n";
+			print PLOG "$conf::sudo $conf::apt_get $main::chroot_apt_options -q update\n";
 			if (!open( PIPE, "$conf::sudo $conf::apt_get $main::chroot_apt_options - -q update 2>&1 |" )) {
 				print PLOG "Can't open pipe to apt-get: $!\n";
 				return 0;
@@ -2238,7 +2238,7 @@
 	my %deps;
 	
 	open( PIPE, "$conf::apt_cache $main::chroot_apt_options show @_ 2>&1 |" )
-		or die "Cannot start $conf::apt_cache $main::chroot_apt_op: $!\n";
+		or die "Cannot start $conf::apt_cache $main::chroot_apt_options: $!\n";
 	local($/) = "";
 	while( <PIPE> ) {
 		my ($name, $dep, $predep);
@@ -2260,7 +2260,7 @@
 	local(*PIPE);
 
 	open( PIPE, "$conf::apt_cache $main::chroot_apt_options showpkg @_ 2>&1 |" )
-		or die "Cannot start $conf::apt_cache $main::chroot_apt_op: $!\n";
+		or die "Cannot start $conf::apt_cache $main::chroot_apt_options: $!\n";
 	my $name;
 	my $in_rprov = 0;
 	my %provided_by;
@@ -3215,7 +3215,6 @@
 										"-o Dir::Etc::parts=$main::chroot_dir/etc/apt/apt.conf.d ";
 			}
 		}
-		$main::chroot_apt_op = '$CHROOT_OPTIONS';
 	} elsif ($conf::chroot_only) {
 		die "$distribution chroot does not exist and in chroot only mode -- exiting\n";
 	}

- --=-=-=--
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (GNU/Linux)

iD8DBQFD7hs0VcFcaSW/uEgRAgFRAJ9BnzVBCEchbzPddPud9fwDGs7ehQCg7J5W
QZ2Z7XztWhzyu7NAn9Qua5E=8TRk
-----END PGP SIGNATURE-----