summaryrefslogtreecommitdiff
path: root/apt-pkg/init.cc
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2009-12-10 16:06:40 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2009-12-10 16:06:40 +0100
commite4b16ac68196eab5e58abf715459fe70c199cff3 (patch)
tree12702a5b543249f7204d476791615d3828bb2a9f /apt-pkg/init.cc
parentf3ceaca7a648f7d93fa88106910151e69f498801 (diff)
parentac81ae9c07b7f2c3cc5afa76b197086814186557 (diff)
* merge lp:~mvo/apt/netrc branch, this adds support for a
/etc/apt/auth.conf that can be used to store username/passwords in a "netrc" style file (with the extension that it supports "/" in a machine definition). Based on the maemo git branch. * apt-pkg/deb/dpkgpm.cc: - add "purge" to list of known actions
Diffstat (limited to 'apt-pkg/init.cc')
-rw-r--r--apt-pkg/init.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc
index 15efb1a3d..a54c09a36 100644
--- a/apt-pkg/init.cc
+++ b/apt-pkg/init.cc
@@ -65,6 +65,7 @@ bool pkgInitConfig(Configuration &Cnf)
Cnf.Set("Dir::Etc::vendorlist","vendors.list");
Cnf.Set("Dir::Etc::vendorparts","vendors.list.d");
Cnf.Set("Dir::Etc::main","apt.conf");
+ Cnf.Set("Dir::ETc::netrc", "auth.conf");
Cnf.Set("Dir::Etc::parts","apt.conf.d");
Cnf.Set("Dir::Etc::preferences","preferences");
Cnf.Set("Dir::Etc::preferencesparts","preferences.d");