diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2013-04-08 15:38:45 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2013-04-08 15:38:45 +0200 |
| commit | 3278fe66567d149ea92c1afa78941f2bc3c71c85 (patch) | |
| tree | 3a735d19278bb8f5aa19ba2707f3a09cf52e1d21 /cmdline | |
| parent | 37cc828e003f51d63ed991be5acac36765b8230a (diff) | |
| parent | 885594fc8831d1be5a254557385e3dbefb564fbf (diff) | |
| download | apt-3278fe66567d149ea92c1afa78941f2bc3c71c85.tar.gz | |
merged bundle from david
Diffstat (limited to 'cmdline')
| -rw-r--r-- | cmdline/apt-get.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 64b062ea4..999f2a6a7 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1912,7 +1912,6 @@ bool DoInstall(CommandLine &CmdL) return false; } - unsigned short const order[] = { MOD_REMOVE, MOD_INSTALL, 0 }; TryToInstall InstallAction(Cache, Fix, BrokenFix); TryToRemove RemoveAction(Cache, Fix); @@ -1920,6 +1919,7 @@ bool DoInstall(CommandLine &CmdL) // new scope for the ActionGroup { pkgDepCache::ActionGroup group(Cache); + unsigned short const order[] = { MOD_REMOVE, MOD_INSTALL, 0 }; for (unsigned short i = 0; order[i] != 0; ++i) { @@ -2023,7 +2023,7 @@ bool DoInstall(CommandLine &CmdL) /* Print out a list of suggested and recommended packages */ { - string SuggestsList, RecommendsList, List; + string SuggestsList, RecommendsList; string SuggestsVersions, RecommendsVersions; for (unsigned J = 0; J < Cache->Head().PackageCount; J++) { |