← Back to branch summary

~jr/ubuntu/oneiric/apt/bzr-get-rename

« back to all changes in this revision

Viewing changes to dselect/setup

  • Committer: Bazaar Package Importer
  • Author(s): Matt Zimmerman
  • Date: 2005-03-07 20:08:33 UTC
  • Revision ID: james.westby@ubuntu.com-20050307200833-0lxdgg2cb4oculdv
Tags: 0.6.35
* Merge apt--mvo--0 (incorporates 0.6.34ubuntu1):
  - Implement MaxSize and MaxAge in apt.cron.daily, to prevent the cache
    from growing too large (Ubuntu #6761)
  - some comments about the pkgAcqMetaSig::Custom600Headers() added
  - use gpg --with-colons
  - commented the ftp no_proxy unseting in methods/ftp.cc
  - added support for "Acquire::gpgv::options" in methods/gpgv.cc
* Merge bubulle@debian.org--2005/apt--main--0
  - Make capitalization more consistent
  - Un-fuzzy translations resulting from capitalization changes
  - Italian translation update

Show diffs side-by-side

added added

removed removed

Lines of Context:
dselect/setup
30
30
 
31
31
my @known_types           = ('deb');
32
32
my @known_access         = ('http', 'ftp', 'file');
33
 
my @typical_distributions = ('stable', 'unstable', 'frozen', 'non-US');
 
33
my @typical_distributions = ('stable', 'unstable', 'testing', 'non-US');
34
34
my @typical_components    = ('main', 'contrib', 'non-free');
35
35
 
36
36
my %known_access           = map {($_,$_)} @known_access;
269
269
    print "-" x 72, "\n";
270
270
    &print_config('Config' => \@Oldconfig);
271
271
    print "-" x 72, "\n";
272
 
    print "$boldon Do you wish to change (overwrite) it?[y/N]$boldoff ";
 
272
    print "$boldon Do you wish to overwrite it? [y/N]$boldoff ";
273
273
    my $answer = <STDIN>;
274
274
    chomp ($answer);
275
275
    $answer =~ s/\s+/ /og;