diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2007-07-12 16:53:43 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2007-07-12 16:53:43 +0100 |
| commit | a975773b97214620c750cb2465e01f811a33831d (patch) | |
| tree | 4835baa63349c60f29c3073b59849f51902adb16 /cmdline/apt-get.cc | |
| parent | 50ccb2f437daabf5d4c7eb5322a5ed11374cd048 (diff) | |
| parent | f03dd1e032139356f1e5b7f19fb76482ae05e311 (diff) | |
* cmdline/apt-get.cc:
- fix in the task-install code regexp (thanks to Adam Conrad and
Colin Watson). This should bring the livecd build back into
shape
* Fix compilation warnings:
- apt-pkg/contrib/configuration.cc: wrong argument type;
- apt-pkg/deb/dpkgpm.cc: wrong signess;
- apt-pkg-acquire-item.cc: wrong signess and orderned initializers;
- methods/https.cc:
- type conversion;
- unused variable;
- changed SetupProxy() method to void;
Diffstat (limited to 'cmdline/apt-get.cc')
| -rw-r--r-- | cmdline/apt-get.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 2e5779070..82257a06e 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1519,8 +1519,9 @@ bool TryInstallTask(pkgDepCache &Cache, pkgProblemResolver &Fix, // build regexp for the task char S[300]; - snprintf(S, sizeof(S), "^Task:.*[^a-z]%s([^a-z]|\n|$)", 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; |