diff options
| -rw-r--r-- | cmdline/apt-get.cc | 4 | ||||
| -rw-r--r-- | po/apt-all.pot | 94 |
2 files changed, 49 insertions, 49 deletions
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 57e0e9ec7..2062aaa16 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1423,14 +1423,12 @@ bool DoInstallTask(CommandLine &CmdL) pkgRecords Recs(Cache); unsigned int ExpectedInst = 0; - unsigned int Packages = 0; pkgProblemResolver Fix(Cache); char buf[64*1024]; for (const char **I = CmdL.FileList + 1; *I != 0; I++) { regex_t Pattern; - int Res; // build regexp for the task char S[300]; @@ -1450,6 +1448,8 @@ bool DoInstallTask(CommandLine &CmdL) continue; TryToInstall(Pkg,Cache,Fix,false,true,ExpectedInst); } + + regfree(&Pattern); } // Call the scored problem resolver diff --git a/po/apt-all.pot b/po/apt-all.pot index 006a07bfc..d4c3a4ff7 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-09-19 13:29+0200\n" +"POT-Creation-Date: 2006-09-19 15:56+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -148,7 +148,7 @@ msgstr "" #: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 -#: cmdline/apt-get.cc:2430 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2441 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "" @@ -546,7 +546,7 @@ msgstr "" msgid "Y" msgstr "" -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1549 +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1560 #, c-format msgid "Regex compilation error - %s" msgstr "" @@ -705,11 +705,11 @@ msgstr "" msgid "Internal error, Ordering didn't finish" msgstr "" -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1894 +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1872 cmdline/apt-get.cc:1905 msgid "Unable to lock the download directory" msgstr "" -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1942 cmdline/apt-get.cc:2178 +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1953 cmdline/apt-get.cc:2189 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "" @@ -738,7 +738,7 @@ msgstr "" msgid "After unpacking %sB disk space will be freed.\n" msgstr "" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:2032 +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:2043 #, c-format msgid "Couldn't determine free space in %s" msgstr "" @@ -772,7 +772,7 @@ msgstr "" msgid "Do you want to continue [Y/n]? " msgstr "" -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2075 +#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2086 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" @@ -781,7 +781,7 @@ msgstr "" msgid "Some files failed to download" msgstr "" -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2084 +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2095 msgid "Download complete and in download only mode" msgstr "" @@ -891,27 +891,27 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1536 cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1547 cmdline/apt-get.cc:1583 #, c-format msgid "Couldn't find package %s" msgstr "" -#: cmdline/apt-get.cc:1559 +#: cmdline/apt-get.cc:1570 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1589 +#: cmdline/apt-get.cc:1600 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" -#: cmdline/apt-get.cc:1592 +#: cmdline/apt-get.cc:1603 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -#: cmdline/apt-get.cc:1604 +#: cmdline/apt-get.cc:1615 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -919,163 +919,163 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1612 +#: cmdline/apt-get.cc:1623 msgid "" "Since you only requested a single operation it is extremely likely that\n" "the package is simply not installable and a bug report against\n" "that package should be filed." msgstr "" -#: cmdline/apt-get.cc:1617 +#: cmdline/apt-get.cc:1628 msgid "The following information may help to resolve the situation:" msgstr "" -#: cmdline/apt-get.cc:1620 +#: cmdline/apt-get.cc:1631 msgid "Broken packages" msgstr "" -#: cmdline/apt-get.cc:1646 +#: cmdline/apt-get.cc:1657 msgid "The following extra packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:1735 +#: cmdline/apt-get.cc:1746 msgid "Suggested packages:" msgstr "" -#: cmdline/apt-get.cc:1736 +#: cmdline/apt-get.cc:1747 msgid "Recommended packages:" msgstr "" -#: cmdline/apt-get.cc:1756 +#: cmdline/apt-get.cc:1767 msgid "Calculating upgrade... " msgstr "" -#: cmdline/apt-get.cc:1759 methods/ftp.cc:702 methods/connect.cc:101 +#: cmdline/apt-get.cc:1770 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "" -#: cmdline/apt-get.cc:1764 +#: cmdline/apt-get.cc:1775 msgid "Done" msgstr "" -#: cmdline/apt-get.cc:1829 cmdline/apt-get.cc:1837 +#: cmdline/apt-get.cc:1840 cmdline/apt-get.cc:1848 msgid "Internal error, problem resolver broke stuff" msgstr "" -#: cmdline/apt-get.cc:1937 +#: cmdline/apt-get.cc:1948 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:1967 cmdline/apt-get.cc:2196 +#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:2207 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:2011 +#: cmdline/apt-get.cc:2022 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: cmdline/apt-get.cc:2035 +#: cmdline/apt-get.cc:2046 #, c-format msgid "You don't have enough free space in %s" msgstr "" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2051 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2043 +#: cmdline/apt-get.cc:2054 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2049 +#: cmdline/apt-get.cc:2060 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:2080 +#: cmdline/apt-get.cc:2091 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:2108 +#: cmdline/apt-get.cc:2119 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2120 +#: cmdline/apt-get.cc:2131 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2121 +#: cmdline/apt-get.cc:2132 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2138 +#: cmdline/apt-get.cc:2149 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2157 +#: cmdline/apt-get.cc:2168 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2173 +#: cmdline/apt-get.cc:2184 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2201 +#: cmdline/apt-get.cc:2212 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2221 +#: cmdline/apt-get.cc:2232 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2273 +#: cmdline/apt-get.cc:2284 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:2325 +#: cmdline/apt-get.cc:2336 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:2360 +#: cmdline/apt-get.cc:2371 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2396 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2399 +#: cmdline/apt-get.cc:2410 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2403 +#: cmdline/apt-get.cc:2414 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2435 +#: cmdline/apt-get.cc:2446 msgid "Supported modules:" msgstr "" -#: cmdline/apt-get.cc:2476 +#: cmdline/apt-get.cc:2487 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" |