diff options
| -rw-r--r-- | cmdline/apt-get.cc | 6 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | po/apt-all.pot | 42 |
4 files changed, 31 insertions, 26 deletions
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index aa54677be..95600ff6d 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1519,9 +1519,9 @@ bool TryInstallTask(pkgDepCache &Cache, pkgProblemResolver &Fix, // build regexp for the task char S[300]; - // better: "^Task:.*[^a-z]lamp-server([^a-z]|\n)" ? - snprintf(S, sizeof(S), "^Task:.*[^a-z]%s[^a-z].*$", taskname); - regcomp(&Pattern,S, REG_EXTENDED | REG_NOSUB | REG_NEWLINE); + snprintf(S, sizeof(S), "^Task:.*[, ]%s([, ]|$)", taskname); + if(regcomp(&Pattern,S, REG_EXTENDED | REG_NOSUB | REG_NEWLINE) != 0) + return _error->Error("Failed to compile task regexp"); bool found = false; bool res = true; diff --git a/configure.in b/configure.in index 4daa0ab78..9bb1a8baf 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.7.2-0.1") +AC_DEFINE_UNQUOTED(VERSION,"0.7.4") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/changelog b/debian/changelog index c81d487ab..6e74f4265 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,10 @@ apt (0.7.4) UNRELEASED; urgency=low + [Michael Vogt] + * cmdline/apt-get.cc: + - fix in the task-install code regexp (thanks to Adam Conrad and + Colin Watson) + [Otavio Salvador] * Fix a typo on 0.7.3 changelog entry about g++ (7.3 to 4.3) * Fix compilation warnings: - apt-pkg/contrib/configuration.cc: wrong argument type; @@ -12,7 +17,7 @@ apt (0.7.4) UNRELEASED; urgency=low * Simplified HttpMethod::Fetch on http.cc removing Tail variable; * Fix pipeline handling on http.cc (closes: #413324) - -- Otavio Salvador <otavio@ossystems.com.br> Mon, 02 Jul 2007 13:27:54 -0300 + -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 11 Jul 2007 23:20:15 +0100 apt (0.7.3) unstable; urgency=low diff --git a/po/apt-all.pot b/po/apt-all.pot index cccd4b75a..d1d6c7622 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: 2007-06-12 22:26+0200\n" +"POT-Creation-Date: 2007-07-11 23:19+0100\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" @@ -1371,7 +1371,7 @@ msgstr "" msgid "File %s/%s overwrites the one in the package %s" msgstr "" -#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747 +#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 #: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 #, c-format @@ -1883,57 +1883,57 @@ msgstr "" msgid "Selection %s not found" msgstr "" -#: apt-pkg/contrib/configuration.cc:433 +#: apt-pkg/contrib/configuration.cc:434 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "" -#: apt-pkg/contrib/configuration.cc:491 +#: apt-pkg/contrib/configuration.cc:492 #, c-format msgid "Opening configuration file %s" msgstr "" -#: apt-pkg/contrib/configuration.cc:509 +#: apt-pkg/contrib/configuration.cc:510 #, c-format -msgid "Line %d too long (max %d)" +msgid "Line %d too long (max %u)" msgstr "" -#: apt-pkg/contrib/configuration.cc:605 +#: apt-pkg/contrib/configuration.cc:606 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "" -#: apt-pkg/contrib/configuration.cc:624 +#: apt-pkg/contrib/configuration.cc:625 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "" -#: apt-pkg/contrib/configuration.cc:641 +#: apt-pkg/contrib/configuration.cc:642 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "" -#: apt-pkg/contrib/configuration.cc:681 +#: apt-pkg/contrib/configuration.cc:682 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" -#: apt-pkg/contrib/configuration.cc:688 +#: apt-pkg/contrib/configuration.cc:689 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "" -#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697 +#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "" -#: apt-pkg/contrib/configuration.cc:701 +#: apt-pkg/contrib/configuration.cc:702 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "" -#: apt-pkg/contrib/configuration.cc:735 +#: apt-pkg/contrib/configuration.cc:736 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "" @@ -2242,7 +2242,7 @@ msgid "" "you really want to do it, activate the APT::Force-LoopBreak option." msgstr "" -#: apt-pkg/pkgrecords.cc:34 +#: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "" @@ -2355,7 +2355,7 @@ msgstr "" #: apt-pkg/pkgcachegen.cc:153 #, c-format -msgid "Error occured while processing %s (NewFileDesc1)" +msgid "Error occurred while processing %s (NewFileDesc1)" msgstr "" #: apt-pkg/pkgcachegen.cc:178 @@ -2385,7 +2385,7 @@ msgstr "" #: apt-pkg/pkgcachegen.cc:245 #, c-format -msgid "Error occured while processing %s (NewFileDesc2)" +msgid "Error occurred while processing %s (NewFileDesc2)" msgstr "" #: apt-pkg/pkgcachegen.cc:251 @@ -2622,10 +2622,10 @@ msgstr "" msgid "Completely removed %s" msgstr "" -#: methods/rred.cc:219 -msgid "Could not patch file" -msgstr "" - #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "" + +#: methods/rred.cc:219 +msgid "Could not patch file" +msgstr "" |