← Back to branch summary

~ubuntu-branches/ubuntu/natty/sbuild/natty-updates

« back to all changes in this revision

Viewing changes to lib/Sbuild/DB/ClientConf.pm

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2010-05-14 23:13:17 UTC
  • mfrom: (8.1.12 upstream) (3.3.3 sid)
  • Revision ID: james.westby@ubuntu.com-20100514231317-hw1e0x09tefx3ocm
Tags: 0.60.0-1ubuntu1
https://launchpad.net/bugs/580724
https://launchpad.net/bugs/558461
* Merge from Debian unstable (LP: #580724), remaining changes:
  - Do not install debfoster into the chroots because it is in universe
    and not needed for package building itself.
* buildd: Declare Replaces and Breaks on ubuntu-dev-tools (<= 0.83) as
  both packages contain /usr/bin/buildd. (LP: #558461)

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/Sbuild/DB/ClientConf.pm
108
108
            CHECK => $validate_ssh,
109
109
        },
110
110
        'WANNA_BUILD_DB_NAME'                   => {
111
 
            DEFAULT => "$arch/build-db"
 
111
            DEFAULT => undef,
112
112
        },
113
113
        'WANNA_BUILD_DB_USER'                   => {
114
114
            DEFAULT => $self->get('USERNAME')
115
 
        });
 
115
        },
 
116
        'BUILT_ARCHITECTURE'                    => {
 
117
            DEFAULT => $arch,
 
118
        },);
116
119
 
117
120
    $self->set_allowed_keys(\%db_keys);
118
121
}