summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2013-08-24 09:07:37 +0200
committerMichael Vogt <mvo@debian.org>2013-08-24 09:07:37 +0200
commit3365521f814647d9e6f2a8beaeab37e3fb0e8342 (patch)
tree3c2c4de104423c4246b221104fa17d4c16a5c28f
parent6fd51a5f4300f4b1563cdf2a34f59e6bbaacb838 (diff)
parent17e4360804ffd2b5530b8ceb0e42834eb99e526e (diff)
Merge remote-tracking branch 'mvo/debian/sid' into debian/sid
-rwxr-xr-xdselect/update2
-rw-r--r--ftparchive/override.cc2
2 files changed, 2 insertions, 2 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"
diff --git a/ftparchive/override.cc b/ftparchive/override.cc
index 760c20120..1288ff133 100644
--- a/ftparchive/override.cc
+++ b/ftparchive/override.cc
@@ -49,7 +49,7 @@ bool Override::ReadOverride(string const &File,bool const &Source)
// Strip space leading up to the package name, skip blank lines
char *Pkg = Line;
for (; isspace(*Pkg) && *Pkg != 0;Pkg++);
- if (Pkg == 0)
+ if (*Pkg == 0)
continue;
// Find the package and zero..