Adeodato Simó <[EMAIL PROTECTED]> writes:
> sbuild 0.43 introduced the following nifty feature (thanks!):
>
> - When using schroot, look for a distribution named
> "$distribution-sbuild" in preference to "$distribution".
>
> I've observed, though, that if sbuild picks ${dist}-sbuild
> automatically, the chroot will no longer be regarded as session
> managed, even if it is.
Please could you try applying the attached patch, and see if it fixes
it for you?
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.
Index: sbuild
===================================================================
--- sbuild (revision 514)
+++ sbuild (working copy)
@@ -349,19 +349,20 @@
$pkg =~ s/^\.\///;
next if !open_pkg_log( $pkgv );
+ my $schroot_distribution;
if ($conf::chroot_mode eq "schroot") {
- my $distribution = $main::distribution;
+ $schroot_distribution = $main::distribution;
if (defined($main::dist_locations{"${main::distribution}-sbuild"})) {
- $distribution = "${main::distribution}-sbuild";
+ $schroot_distribution = "${main::distribution}-sbuild";
}
- $main::schroot_session=`$conf::schroot -c $distribution --begin-session`;
+ $main::schroot_session=`$conf::schroot -c $schroot_distribution --begin-session`;
chomp($main::schroot_session);
if ($?) {
print PLOG "Chroot setup failed; skipping $pkg\n";
$main::pkg_status = "skipped";
goto cleanup_close;
}
- print PLOG "Setting up chroot $distribution (session id $main::schroot_session)\n"
+ print PLOG "Setting up chroot $schroot_distribution (session id $main::schroot_session)\n"
if $main::debug;
get_schroot_info($main::schroot_session);
setup_options($main::schroot_session);
@@ -398,8 +399,8 @@
cleanup_packages:
undo_specials();
if ($conf::chroot_mode eq "schroot" &&
- defined ($main::dist_sessioncaps{$main::distribution}) &&
- $main::dist_sessioncaps{$main::distribution} == 1) {
+ defined ($main::dist_sessioncaps{$schroot_distribution}) &&
+ $main::dist_sessioncaps{$schroot_distribution} == 1) {
print PLOG "Not removing build depends: session managed chroot in use\n";
} else {
uninstall_deps();
pgpeRJewVJaTq.pgp
Description: PGP signature
