Re: 0.5.15cnc7 release candidate

Matthew Miller <[email protected]> Fri, 11 Mar 2005 11:56:28 -0500
Newsgroups gmane.linux.conectiva.apt-rpm
Message-ID <[email protected]> 
On Fri, Mar 11, 2005 at 06:38:53PM +0200, Panu Matilainen wrote:
> The last one is perhaps a bit controversial - it makes apt take readonly
> lock on rpmdb instead of exclusive rw lock during initial dependency
> calculations. I've been using this on hundreds of hosts at work and it's
> been included in Fedora Extras apt without any complaints or noticed
> brokenness though...
> http://laiskiainen.org/apt/patches/apt-0.5.15cnc6-rdonly.patch
> Is it ok if I commit the first two? Thoughts about the rdonly-thingy?

We've been using this for BU Linux for a long time too, with the same lack
of problems.

Ooh -- also, an attached patch to spell out "--fix-broken" instead of "-f"
in the messages which suggest using that. I found that people were very
reluctant to use '-f' because they thought it was "force" and very sensibly
didn't want to do that.

-- 
Matthew Miller           [email protected]        <http://www.mattdm.org/>
Boston University Linux      ------>                <http://linux.bu.edu/>

_______________________________________________
apt-rpm mailing list
[email protected]
http://distro2.conectiva.com.br/mailman/listinfo/apt-rpm
apt-0.5.15-spelloutfixbroken.patch (text/plain, 4 KB) 
diff -ur apt-0.5.15cnc6.orig/cmdline/apt-get.cc apt-0.5.15cnc6/cmdline/apt-get.cc
--- apt-0.5.15cnc6.orig/cmdline/apt-get.cc	2004-03-22 15:40:03.000000000 -0500
+++ apt-0.5.15cnc6/cmdline/apt-get.cc	2004-06-11 14:42:04.227178743 -0400
@@ -825,10 +825,10 @@
    }
    else
    {
-      c1out << _("You might want to run `apt-get -f install' to correct these.") << endl;
+      c1out << _("You might want to run `apt-get --fix-broken install' to correct these.") << endl;
       ShowBroken(c1out,*this,true);
 
-      return _error->Error(_("Unmet dependencies. Try using -f."));
+      return _error->Error(_("Unmet dependencies. Try using --fix-broken."));
    }
       
    return true;
@@ -2037,10 +2037,10 @@
       packages */
    if (BrokenFix == true && Cache->BrokenCount() != 0)
    {
-      c1out << _("You might want to run `apt-get -f install' to correct these:") << endl;
+      c1out << _("You might want to run `apt-get --fix-broken install' to correct these:") << endl;
       ShowBroken(c1out,Cache,false);
 
-      return _error->Error(_("Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a solution)."));
+      return _error->Error(_("Unmet dependencies. Try 'apt-get --fix-broken install' with no packages (or specify a solution)."));
    }
    
    // Call the scored problem resolver
@@ -2893,7 +2893,7 @@
       // Now we check the state of the packages,
       if (Cache->BrokenCount() != 0)
 	 return _error->Error(_("Some broken packages were found while trying to process build-dependencies for %s.\n"
-				"You might want to run `apt-get -f install' to correct these."),*I);
+				"You might want to run `apt-get --fix-broken install' to correct these."),*I);
    }
   
    if (InstallPackages(Cache, false, true) == false)
diff -ur apt-0.5.15cnc6.orig/cmdline/apt-shell.cc apt-0.5.15cnc6/cmdline/apt-shell.cc
--- apt-0.5.15cnc6.orig/cmdline/apt-shell.cc	2004-03-15 17:10:41.000000000 -0500
+++ apt-0.5.15cnc6/cmdline/apt-shell.cc	2004-06-11 14:43:12.643650749 -0400
@@ -150,7 +150,7 @@
 	 if ((*Cache)->CheckDeps(true) == false) {
 	    c1out << _("There are broken packages. ")
 		  << _("Run `check' to see them.") << endl;
-	    c1out << _("You can try to fix them automatically with `install -f'.") << endl;
+	    c1out << _("You can try to fix them automatically with `install --fix-broken'0.") << endl;
 	 }
       }
    };
@@ -930,10 +930,10 @@
    }
    else
    {
-      c1out << _("You might want to run `install -f' to correct these.") << endl;
+      c1out << _("You might want to run `install --fix-broken' to correct these.") << endl;
       ShowBroken(c1out,*this,true);
 
-      return _error->Error(_("Unmet dependencies. Try using -f."));
+      return _error->Error(_("Unmet dependencies. Try using --fix-broken."));
    }
       
    return true;
@@ -2114,7 +2114,7 @@
       ConfirmChanges(Cache, StateGuard);
       c1out << _("There are still broken packages. ")
 	    << _("Run `check' to see them.") << endl;
-      c1out << _("You can try to fix them automatically with `install -f'.") << endl;
+      c1out << _("You can try to fix them automatically with `install --fix-broken'.") << endl;
       return true;
    }
 
@@ -2651,7 +2651,7 @@
       // Now we check the state of the packages,
       if (Cache->BrokenCount() != 0)
 	 return _error->Error(_("Some broken packages were found while trying to process build-dependencies for %s.\n"
-				"You might want to run `apt-get -f install' to correct these."),*I);
+				"You might want to run `apt-get --fix-broken install' to correct these."),*I);
    }
   
    ConfirmChanges(Cache, StateGuard);
@@ -4420,7 +4420,7 @@
    if (GCache->CheckDeps(true) == false) {
       c1out << _("There are broken packages. ")
 	    << _("Run `check' to see them.") << endl;
-      c1out << _("You can try to fix them automatically with `install -f'.") << endl;
+      c1out << _("You can try to fix them automatically with `install --fix-broken'.") << endl;
    }
 
    // Make a copy of the configuration. Each command will modify its