tags 322208 + patch
kthxbye
Hi,
I've written a patch that doesn't preserve the DISPLAY
environment variable by the usual standard, but stores it out of the
way, and then sets it again before calling debsign.
Cheers,
--
Steve
"I'm a doctor, not a doorstop"
- EMH, USS Enterprise
--- scripts/debuild.pl~ 2007-06-16 14:06:19.000000000 +0100
+++ scripts/debuild.pl 2007-06-29 14:03:59.000000000 +0100
@@ -579,6 +579,12 @@ if ($save_vars{'PATH'}) {
$save_vars{'PATH'}=1;
$ENV{'TERM'}='dumb' unless exists $ENV{'TERM'};
+# Store a few variables for safe keeping.
+my %store_vars;
+foreach my $var (('DISPLAY', 'GNOME_KEYRING_SOCKET', 'XAUTHORITY')) {
+ $store_vars{$var} = $ENV{$var} if defined $ENV{$var};
+}
+
unless ($preserve_env) {
foreach my $var (keys %ENV) {
delete $ENV{$var} unless
@@ -1151,6 +1151,9 @@ if ($command_version eq 'dpkg') {
run_hook('signing', ($signchanges || (! $sourceonly and $signsource)) );
if ($signchanges) {
+ foreach my $var (keys %store_vars) {
+ $ENV{$var} = $store_vars{$var};
+ }
print "Now signing changes and any dsc files...\n";
system('debsign', @debsign_opts, $changes) == 0
or fatal "running debsign failed";
