diff options
| -rw-r--r-- | cmdline/apt-get.cc | 7 | ||||
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | po/sv.po | 34 |
3 files changed, 6 insertions, 37 deletions
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 95600ff6d..df0414076 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1507,7 +1507,8 @@ bool DoUpgrade(CommandLine &CmdL) bool TryInstallTask(pkgDepCache &Cache, pkgProblemResolver &Fix, bool BrokenFix, unsigned int& ExpectedInst, - const char *taskname) + const char *taskname, + bool Remove) { const char *start, *end; pkgCache::PkgIterator Pkg; @@ -1536,7 +1537,7 @@ bool TryInstallTask(pkgDepCache &Cache, pkgProblemResolver &Fix, buf[end-start] = 0x0; if (regexec(&Pattern,buf,0,0,0) != 0) continue; - res &= TryToInstall(Pkg,Cache,Fix,false,true,ExpectedInst); + res &= TryToInstall(Pkg,Cache,Fix,Remove,true,ExpectedInst); found = true; } @@ -1604,7 +1605,7 @@ bool DoInstall(CommandLine &CmdL) // tasks must always be confirmed ExpectedInst += 1000; // see if we can install it - TryInstallTask(Cache, Fix, BrokenFix, ExpectedInst, S); + TryInstallTask(Cache, Fix, BrokenFix, ExpectedInst, S, Remove); continue; } diff --git a/debian/changelog b/debian/changelog index 48429c9da..11cdd22cd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ apt (0.7.4) UNRELEASED; urgency=low * cmdline/apt-get.cc: - fix in the task-install code regexp (thanks to Adam Conrad and Colin Watson) + - support task removal too: apt-get remove taskname^ + (thanks to Matt Zimmerman reporting this problem) [ Otavio Salvador ] * Fix a typo on 0.7.3 changelog entry about g++ (7.3 to 4.3) @@ -1051,13 +1051,8 @@ msgstr "Internt fel, AutoRemover förstörde något" msgid "Internal error, AllUpgrade broke stuff" msgstr "Internt fel, AllUpgrade förstörde något" -<<<<<<< TREE -#: cmdline/apt-get.cc:1544 -#, fuzzy, c-format -======= #: cmdline/apt-get.cc:1544 #, c-format ->>>>>>> MERGE-SOURCE msgid "Couldn't find task %s" msgstr "Kunde inte hitta funktionen %s" @@ -1071,13 +1066,8 @@ msgstr "Kunde inte hitta paketet %s" msgid "Note, selecting %s for regex '%s'\n" msgstr "Observera, väljer %s för det reguljära uttrycket \"%s\"\n" -<<<<<<< TREE -#: cmdline/apt-get.cc:1712 -#, fuzzy, c-format -======= #: cmdline/apt-get.cc:1712 #, c-format ->>>>>>> MERGE-SOURCE msgid "%s set to manual installed.\n" msgstr "%s är satt till manuellt installerad.\n" @@ -1267,12 +1257,7 @@ msgstr "Misslyckades med att behandla byggberoenden" msgid "Supported modules:" msgstr "Moduler som stöds:" -<<<<<<< TREE -#: cmdline/apt-get.cc:2630 -#, fuzzy -======= #: cmdline/apt-get.cc:2630 ->>>>>>> MERGE-SOURCE msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -2124,17 +2109,10 @@ msgstr "Okänd typförkortning: \"%c\"" msgid "Opening configuration file %s" msgstr "Öppnar konfigurationsfilen %s" -<<<<<<< TREE -#: apt-pkg/contrib/configuration.cc:510 -#, fuzzy, c-format -msgid "Line %d too long (max %lu)" -msgstr "Rad %d för lång (max %d)" -======= #: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Line %d too long (max %lu)" msgstr "Rad %d är för lång (max %lu)" ->>>>>>> MERGE-SOURCE #: apt-pkg/contrib/configuration.cc:606 #, c-format @@ -2606,15 +2584,9 @@ msgid "Error occurred while processing %s (UsePackage1)" msgstr "Fel uppstod vid hantering av %s (UsePackage1)" #: apt-pkg/pkgcachegen.cc:153 -<<<<<<< TREE -#, fuzzy, c-format -msgid "Error occurred while processing %s (NewFileDesc1)" -msgstr "Fel uppstod vid hantering av %s (NewFileVer1)" -======= #, c-format msgid "Error occurred while processing %s (NewFileDesc1)" msgstr "Fel uppstod vid hantering av %s (NewFileDesc1)" ->>>>>>> MERGE-SOURCE #: apt-pkg/pkgcachegen.cc:178 #, c-format @@ -2642,15 +2614,9 @@ msgid "Error occurred while processing %s (NewVersion2)" msgstr "Fel uppstod vid hantering av %s (NewVersion2)" #: apt-pkg/pkgcachegen.cc:245 -<<<<<<< TREE -#, fuzzy, c-format -msgid "Error occurred while processing %s (NewFileDesc2)" -msgstr "Fel uppstod vid hantering av %s (NewFileVer1)" -======= #, c-format msgid "Error occurred while processing %s (NewFileDesc2)" msgstr "Fel uppstod vid hantering av %s (NewFileDesc2)" ->>>>>>> MERGE-SOURCE #: apt-pkg/pkgcachegen.cc:251 msgid "Wow, you exceeded the number of package names this APT is capable of." |