From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Tue, 19 Sep 2006 13:41:52 +0000 (+0200)
Subject: * cmdline/apt-get.cc:
X-Git-Tag: 0.7.24ubuntu1~229^2~2
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/ab04fa68f216974b277c708ab0788ef8798f879f?ds=inline

* cmdline/apt-get.cc:
  - install with FixBroken=true
---

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 9705f84dc..57e0e9ec7 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1434,7 +1434,7 @@ bool DoInstallTask(CommandLine &CmdL)
 
       // build regexp for the task
       char S[300];
-      snprintf(S, sizeof(S), "^Task:.*%s.*\n", *I);
+      snprintf(S, sizeof(S), "^Task:.*[^a-z]%s[^a-z].*\n", *I);
       regcomp(&Pattern,S, REG_EXTENDED | REG_NOSUB | REG_NEWLINE);
 
       for (Pkg = Cache->PkgBegin(); Pkg.end() == false; Pkg++)
@@ -1448,14 +1448,13 @@ bool DoInstallTask(CommandLine &CmdL)
 	 buf[end-start] = 0x0;
 	 if (regexec(&Pattern,buf,0,0,0) != 0)
 	    continue;
-	 TryToInstall(Pkg,Cache,Fix,false,false,ExpectedInst);
+	 TryToInstall(Pkg,Cache,Fix,false,true,ExpectedInst);
       }
    }
 
    // Call the scored problem resolver
    Fix.InstallProtect();
-   if (Fix.Resolve(true) == false)
-      _error->Discard();
+   Fix.Resolve(true);
    
    // prompt for install
    return InstallPackages(Cache,false,true);