diff options
| author | Michael Vogt <mvo@debian.org> | 2014-02-27 22:52:34 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-02-27 22:52:34 +0100 |
| commit | fce69e7a0f38299c57ef96ae1c1dd9a5379bfd5a (patch) | |
| tree | be7d18baa836e9df166ec63f6c9fe6f94bb84b40 /dselect/update | |
| parent | a5e790985752c6820e08e7a7e650e1607fa826e4 (diff) | |
| parent | fc104da6a583736223b2f941e43a05ea26b63a7d (diff) | |
Merge branch 'debian/sid' into debian/experimental
Conflicts:
apt-private/private-list.cc
configure.ac
debian/apt.install.in
debian/changelog
Diffstat (limited to 'dselect/update')
| -rwxr-xr-x | dselect/update | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dselect/update b/dselect/update index 411033ca9..487fbf226 100755 --- a/dselect/update +++ b/dselect/update @@ -6,7 +6,7 @@ TEXTDOMAIN="apt" # Get the configuration from /etc/apt/apt.conf CLEAN="prompt" -OPTS="-f" +OPTS="" APTGET="/usr/bin/apt-get" APTCACHE="/usr/bin/apt-cache" DPKG="/usr/bin/dpkg" |