← Back to branch summary

~ubuntu-branches/ubuntu/precise/sbuild/precise

« back to all changes in this revision

Viewing changes to lib/Sbuild/Conf.pm

  • Committer: Bazaar Package Importer
  • Author(s): Laurent Bigonville
  • Date: 2011-06-26 13:59:34 UTC
  • mfrom: (8.1.21 upstream) (3.3.19 sid)
  • Revision ID: james.westby@ubuntu.com-20110626135934-8blyh9rnoiiqflgt
Tags: 0.62.4-1ubuntu1
* Merge from debian unstable, Remaining changes:
  - debian/patches/do-not-install-debfoster-into-chroots.patch:
    do not install debfoster into the chroots because it is in universe and
    not needed for package building itself.
  - debian/patches/run-pre-build-hooks-as-root.patch:
    run pre-build hooks as root

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/Sbuild/Conf.pm
114
114
        my $key = $entry->{'NAME'};
115
115
        $conf->_set_value($key, $value);
116
116
 
117
 
        $conf->set('MAINTAINER_NAME', $conf->get('UPLOADER_NAME'))
118
 
            if (!$conf->get('MAINTAINER_NAME') &&
119
 
                $conf->get('UPLOADER_NAME'));
120
 
        $conf->set('MAINTAINER_NAME', $conf->get('KEY_ID'))
121
 
            if (!$conf->get('MAINTAINER_NAME') &&
122
 
                $conf->get('KEY_ID'));
123
 
 
124
117
        my @signing_options = ();
125
118
        push @signing_options, "-m".$conf->get('MAINTAINER_NAME')
126
119
            if defined $conf->get('MAINTAINER_NAME');
369
362
            DEFAULT => 1,
370
363
            HELP => 'Filter variable strings from log messages such as the chroot name and build directory'
371
364
        },
 
365
        'LOG_COLOUR'                            => {
 
366
            TYPE => 'BOOL',
 
367
            VARNAME => 'log_colour',
 
368
            GROUP => 'Logging options',
 
369
            DEFAULT => 1,
 
370
            HELP => 'Colour log messages such as critical failures, warnings and sucess'
 
371
        },
372
372
        'LOG_DIR_AVAILABLE'                     => {
373
373
            TYPE => 'BOOL',
374
374
            GROUP => '__INTERNAL',
664
664
                        '^SHELL$'],
665
665
            HELP => 'Only environment variables matching one of the regular expressions in this arrayref will be passed to dpkg-buildpackage and other programs run by sbuild.'
666
666
        },
 
667
        'BUILD_ENVIRONMENT'                     => {
 
668
            TYPE => 'HASH:STRING',
 
669
            VARNAME => 'build_environment',
 
670
            GROUP => 'Core options',
 
671
            DEFAULT => {},
 
672
            HELP => 'Environment to set during the build.  Defaults to setting PATH and LD_LIBRARY_PATH only.  Note that these environment variables are not subject to filtering with ENVIRONMENT_FILTER.  Example:',
 
673
            EXAMPLE =>
 
674
'$build_environment = {
 
675
        \'CCACHE_DIR\' => \'/build/cache\'
 
676
};'
 
677
        },
667
678
        'LD_LIBRARY_PATH'                       => {
668
679
            TYPE => 'STRING',
669
680
            VARNAME => 'ld_library_path',