← 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): Bhavani Shankar
  • Date: 2011-06-19 20:27:25 UTC
  • mfrom: (8.1.20 upstream) (3.3.18 sid)
  • Revision ID: james.westby@ubuntu.com-20110619202725-pzvrs6kdcdjphkp6
Tags: 0.62.3-1ubuntu1
http://bugs.debian.org/607228
* 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 (Closes: #607228)

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/Sbuild/Conf.pm
210
210
                    $validate_program->($conf, $entry);
211
211
                }
212
212
            },
213
 
            DEFAULT => "$Sbuild::Sysconfig::paths{'SBUILD_LIBEXEC_DIR'}/sbuild-schroot",
 
213
            DEFAULT => 'schroot',
214
214
            HELP => 'Path to schroot binary'
215
215
        },
216
216
        'SCHROOT_OPTIONS'                       => {
659
659
                        '^(C(PP|XX)?|LD|F)FLAGS(_APPEND)?$',
660
660
                        '^USER(NAME)?$',
661
661
                        '^LOGNAME$',
 
662
                        '^HOME$',
662
663
                        '^TERM$',
663
664
                        '^SHELL$'],
664
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.'