diff options
author | Michael Vogt <michael.vogt@ubuntu.com> | 2008-03-11 09:53:09 +0100 |
---|---|---|
committer | Michael Vogt <michael.vogt@ubuntu.com> | 2008-03-11 09:53:09 +0100 |
commit | 0748d509f684e192e295302e77263719323f0d1a (patch) | |
tree | ccfef6f6ee4a0254ab1316e66901224102e08723 | |
parent | 704c39d64b265ec9aa70e14ec1a55ef5219762a3 (diff) |
* cmdline/apt-get.cc:
- fix incorrect help output for -f (LP: #57487)
-rw-r--r-- | cmdline/apt-get.cc | 2 | ||||
-rw-r--r-- | debian/changelog | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 11a8b2ef4..920e5e2ec 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -2635,7 +2635,7 @@ bool ShowHelp(CommandLine &CmdL) " -d Download only - do NOT install or unpack archives\n" " -s No-act. Perform ordering simulation\n" " -y Assume Yes to all queries and do not prompt\n" - " -f Attempt to continue if the integrity check fails\n" + " -f Attempt to correct a system with broken dependencies in place\n" " -m Attempt to continue if archives are unlocatable\n" " -u Show a list of upgraded packages as well\n" " -b Build the source package after fetching it\n" diff --git a/debian/changelog b/debian/changelog index a4287b160..6a83107fe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,8 @@ apt (0.7.12) UNRELEASED; urgency=low is run * methods/connect.cc: - remember hosts with Resolve failures or connect Timeouts + * cmdline/apt-get.cc: + - fix incorrect help output for -f (LP: #57487) * debian/apt.cron.daily: - sleep random amount of time (default within 0-30min) before starting the upate to hit the mirrors less hard |