← Back to branch summary

~ubuntu-branches/ubuntu/karmic/sbuild/karmic-updates

« back to all changes in this revision

Viewing changes to lib/Buildd/Mail.pm

  • Committer: Bazaar Package Importer
  • Author(s): Roger Leigh, Roger Leigh
  • Date: 2009-05-19 22:16:46 UTC
  • mfrom: (8.1.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20090519221646-iyxt2sohtaxtwgjr
Tags: 0.58.4-1
http://bugs.debian.org/528312
http://bugs.debian.org/529470
http://bugs.debian.org/509133
[ Roger Leigh ]
* New release. 
* sbuild:
  - A $purge_build_deps configuration option, and --purge-deps
    command-line option have been added to control build-dependency
    removal (Closes: #528312).
  - Use the isin function from the Sbuild module (Closes: #529470).
    Thanks to Gustavo Noronha Silva for spotting this.
* Sbuild:
  - Use Filesys::Df (libfilesys-df-perl) in place of invoking /bin/df
    and parsing its output.  This is more robust and efficient, and
    works whatever the user environment (Closes: #509133).

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/Buildd/Mail.pm
191
191
            $self->purge_pkg( $package, $dist );
192
192
        }
193
193
        elsif ($keyword =~ /^ret/) {
194
 
            if (!$self->check_state( $package, $dist, "Building" )) {
 
194
            if (!$self->check_state( $package, $dist, qw(Building Build-Attempted) )) {
195
195
                # Error already set
196
196
            }
197
197
            else {
199
199
            }
200
200
        }
201
201
        elsif ($keyword =~ /^d(ep(endency)?)?-(ret|w)/) {
202
 
            if (!$self->check_state( $package, $dist, "Building" )) {
 
202
            if (!$self->check_state( $package, $dist, qw(Building Build-Attempted) )) {
203
203
                # Error already set
204
204
            }
205
205
            else {
235
235
        elsif ($keyword =~ /^(give|back)/) {
236
236
            $self->get('Mail Body Text') =~ /^(give|back) ([-0-9]+)/;
237
237
            my $pri = $1;
238
 
            if (!$self->check_state( $package, $dist, "Building" )) {
 
238
            if (!$self->check_state( $package, $dist, qw(Building Build-Attempted) )) {
239
239
                # Error already set
240
240
            }
241
241
            else {
932
932
    my $pipe = $self->get_conf('Host')->pipe_command(
933
933
        { COMMAND => [wannabuild_command($self->get('Config')),
934
934
                      '--failed',
935
 
                      '--no-down-propagation',
936
935
                      "--dist=$dist",
937
936
                      $pkg],
938
937
          PIPE => 'out',
968
967
    my $pipe = $self->get_conf('Host')->pipe_command(
969
968
        { COMMAND => [wannabuild_command($self->get('Config')),
970
969
                      '--dep-wait',
971
 
                      '--no-down-propagation',
972
970
                      "--dist=$dist",
973
971
                      $pkg],
974
972
          PIPE => 'out',
1003
1001
    my $pipe = $self->get_conf('Host')->pipe_command(
1004
1002
        { COMMAND => [wannabuild_command($self->get('Config')),
1005
1003
                      '--give-back',
1006
 
                      '--no-down-propagation',
1007
1004
                      "--dist=$dist",
1008
1005
                      $pkg],
1009
1006
          USER => $self->get_conf('USERNAME'),
1035
1032
    my $pipe = $self->get_conf('Host')->pipe_command(
1036
1033
        { COMMAND => [wannabuild_command($self->get('Config')),
1037
1034
                      '--no-build',
1038
 
                      '--no-down-propagation',
1039
1035
                      "--dist=$dist",
1040
1036
                      $pkg],
1041
1037
          USER => $self->get_conf('USERNAME'),