• attachment:sbuild.patch of SetupBuildServiceForWanna-build

   1 diff -ur a/lib/Buildd/ClientConf.pm b/lib/Buildd/ClientConf.pm
   2 --- a/lib/Buildd/ClientConf.pm	2012-06-01 00:54:02.997262729 +0300
   3 +++ b/lib/Buildd/ClientConf.pm	2012-06-22 20:12:19.288006243 +0300
   4 @@ -103,9 +103,9 @@
   5  	    HELP => 'Path to ssh binary'
   6  	},
   7  	'WANNA_BUILD_SSH_CMD'			=> {
   8 -	    TYPE => 'STRING',
   9 +	    TYPE => 'ARRAY',
  10  	    GROUP => '__INTERNAL',
  11 -	    DEFAULT => '',
  12 +	    DEFAULT => [],
  13  	    HELP => 'Command to run wanna-build (set automatically from the other wanna-build options)'
  14  	},
  15  	'WANNA_BUILD_SSH_USER'			=> {
  16 diff -ur a/lib/Sbuild/Chroot.pm b/lib/Sbuild/Chroot.pm
  17 --- a/lib/Sbuild/Chroot.pm	2012-06-01 00:54:03.001262795 +0300
  18 +++ b/lib/Sbuild/Chroot.pm	2012-06-22 20:02:41.124012188 +0300
  19 @@ -288,6 +288,8 @@
  20      my $commandfilter = $options->{'ENV_FILTER'};
  21      push(@filter, @{$commandfilter}) if defined($commandfilter);
  22  
  23 +	# Disable this because sbuild.conf is not read
  24 +	if (0) {
  25      # Sanitise environment
  26      foreach my $var (keys %ENV) {
  27  	my $match = 0;
  28 @@ -303,6 +305,7 @@
  29  	    debug2("Environment filter: Kept $var\n");
  30  	}
  31      }
  32 +	} # if (0)
  33  
  34      debug2("PROGRAM: $program\n");
  35      debug2("COMMAND: ", join(" ", @{$options->{'COMMAND'}}), "\n");
  36 diff -ur a/lib/Sbuild/ConfBase.pm b/lib/Sbuild/ConfBase.pm
  37 --- a/lib/Sbuild/ConfBase.pm	2012-06-01 00:54:03.001262795 +0300
  38 +++ b/lib/Sbuild/ConfBase.pm	2012-06-22 20:02:41.124012188 +0300
  39 @@ -85,6 +85,7 @@
  40  		   $conf->get('MAILTO_HASH')->{$value})
  41  	    if ($value &&
  42  		$conf->get('DISTRIBUTION') &&
  43 +		defined($conf->get('MAILTO_HASH')) &&
  44  		$conf->get('MAILTO_HASH')->{$value});
  45      };
  46