* smalish changelog fixes

[apt.git] / cmdline / apt-get.cc

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 1dcbbfc5badad255a3ed3b193b67c6974fc8f17b..aa54677be078f0f2e88f1ca4dcd7e04457ffe9bf 100644 (file)
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1519,7 +1519,8 @@ bool TryInstallTask(pkgDepCache &Cache, pkgProblemResolver &Fix,
 
    // build regexp for the task
    char S[300];
 
    // build regexp for the task
    char S[300];

-   snprintf(S, sizeof(S), "^Task:.*[^a-z]%s[^a-z].*\n", taskname);
+   // 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);
    
    bool found = false;
    regcomp(&Pattern,S, REG_EXTENDED | REG_NOSUB | REG_NEWLINE);
    
    bool found = false;


@@ -1535,7 +1536,7 @@ bool TryInstallTask(pkgDepCache &Cache, pkgProblemResolver &Fix,
       buf[end-start] = 0x0;
       if (regexec(&Pattern,buf,0,0,0) != 0)
         continue;
       buf[end-start] = 0x0;
       if (regexec(&Pattern,buf,0,0,0) != 0)
         continue;

-      res &= TryToInstall(Pkg,Cache,Fix,false,BrokenFix,ExpectedInst);
+      res &= TryToInstall(Pkg,Cache,Fix,false,true,ExpectedInst);

       found = true;
    }
    
       found = true;
    }
    


@@ -1595,6 +1596,18 @@ bool DoInstall(CommandLine &CmdL)
         bool Remove = DefRemove;
         char *VerTag = 0;
         bool VerIsRel = false;
         bool Remove = DefRemove;
         char *VerTag = 0;
         bool VerIsRel = false;

+
+         // this is a task!
+         if (Length >= 1 && S[Length - 1] == '^')
+         {
+            S[--Length] = 0;
+            // tasks must always be confirmed
+            ExpectedInst += 1000;
+            // see if we can install it
+            TryInstallTask(Cache, Fix, BrokenFix, ExpectedInst, S);
+            continue;
+         }
+

         while (Cache->FindPkg(S).end() == true)
         {
            // Handle an optional end tag indicating what to do
         while (Cache->FindPkg(S).end() == true)
         {
            // Handle an optional end tag indicating what to do


@@ -1743,10 +1756,8 @@ bool DoInstall(CommandLine &CmdL)
         return _error->Error(_("Broken packages"));
       }   
    }
         return _error->Error(_("Broken packages"));
       }   
    }

-   if (_config->FindB("APT::Get::AutomaticRemove")) {
-      if (!DoAutomaticRemove(Cache)) 
-        return false;
-   }
+   if (!DoAutomaticRemove(Cache)) 
+      return false;

 
    /* Print out a list of packages that are going to be installed extra
       to what the user asked */
 
    /* Print out a list of packages that are going to be installed extra
       to what the user asked */