From: Matt Zimmerman <matt.zimmerman@canonical.com>
Date: Tue, 24 May 2005 21:38:07 +0000 (+0000)
Subject: merge bubulle@debian.org--2005/apt--main--0
X-Git-Tag: 0.7.24ubuntu1~332
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/47a97b733b5462a27975fb44102e948bb10d8538?hp=-c

merge bubulle@debian.org--2005/apt--main--0
Patches applied:

 * bubulle@debian.org--2005/apt--main--0--patch-66
   Italian translation complete

 * bubulle@debian.org--2005/apt--main--0--patch-67
   Sync with Matt

 * bubulle@debian.org--2005/apt--main--0--patch-68
   Sync with Matt

 * bubulle@debian.org--2005/apt--main--0--patch-69
   Sync with Matt

 * bubulle@debian.org--2005/apt--main--0--patch-70
   Re-generate the POT and PO files from sources

 * bubulle@debian.org--2005/apt--main--0--patch-71
   Update French translation

 * bubulle@debian.org--2005/apt--main--0--patch-72
   Merge with Matt

 * bubulle@debian.org--2005/apt--main--0--patch-73
   Basque translation update

 * bubulle@debian.org--2005/apt--main--0--patch-74
   Hebres translation update

 * bubulle@debian.org--2005/apt--main--0--patch-75
   Merge with Matt

 * bubulle@debian.org--2005/apt--main--0--patch-76
   Correct the Hebrew translation for #306658

 * bubulle@debian.org--2005/apt--main--0--patch-77
   Update French man pages translations

 * bubulle@debian.org--2005/apt--main--0--patch-78
   Merge with Matt

 * bubulle@debian.org--2005/apt--main--0--patch-79
   Correct syntax errors in Hebrew translation

 * bubulle@debian.org--2005/apt--main--0--patch-80
   Revert changes to debian/changelog and debian/apt.cron.daily

 * bubulle@debian.org--2005/apt--main--0--patch-81
   Portuguese translation update

 * philippe.batailler@free.fr--2005/apt--mainBubulle--0.1--patch-1
   Passage sous arch
---

47a97b733b5462a27975fb44102e948bb10d8538
diff --combined apt-inst/deb/dpkgdb.cc
index 7b7e90acd,428d91303..c6a0e80e6
--- a/apt-inst/deb/dpkgdb.cc
+++ b/apt-inst/deb/dpkgdb.cc
@@@ -67,7 -67,7 +67,7 @@@ static bool EraseDir(const char *Dir
     if (Pid == 0)
     {
        execlp(_config->Find("Dir::Bin::rm","/bin/rm").c_str(),
 -	     "rm","-rf","--",Dir,0);
 +	     "rm","-rf","--",Dir,(char *)NULL);
        _exit(100);
     }
     return ExecWait(Pid,_config->Find("dir::bin::rm","/bin/rm").c_str());
@@@ -380,7 -380,7 +380,7 @@@ bool debDpkgDB::ReadDiversions(
  bool debDpkgDB::ReadyFileList(OpProgress &Progress)
  {
     if (Cache == 0)
-       return _error->Error(_("The pkg cache must be initialize first"));
+       return _error->Error(_("The pkg cache must be initialized first"));
     if (FList != 0)
     {
        Progress.OverallProgress(1,1,1,_("Reading file list"));
diff --combined cmdline/apt-get.cc
index 00e6aaa67,ae81af3e6..316bb7af9
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@@ -541,7 -541,7 +541,7 @@@ bool ShowEssential(ostream &out,CacheFi
     }
     
     delete [] Added;
-    return ShowList(out,_("WARNING: The following essential packages will be removed\n"
+    return ShowList(out,_("WARNING: The following essential packages will be removed.\n"
  			 "This should NOT be done unless you know exactly what you are doing!"),List,VersionsList);
  }
  
@@@ -862,7 -862,7 +862,7 @@@ bool InstallPackages(CacheFile &Cache,b
        
        const char *Prompt = _("Yes, do as I say!");
        ioprintf(c2out,
- 	       _("You are about to do something potentially harmful\n"
+ 	       _("You are about to do something potentially harmful.\n"
  		 "To continue type in the phrase '%s'\n"
  		 " ?] "),Prompt);
        c2out << flush;
@@@ -1380,15 -1380,6 +1380,15 @@@ bool DoUpgrade(CommandLine &CmdL
  /* Install named packages */
  bool DoInstall(CommandLine &CmdL)
  {
 +   // Lock the list directory
 +   FileFd Lock;
 +   if (_config->FindB("Debug::NoLocking",false) == false)
 +   {
 +      Lock.Fd(GetLock(_config->FindDir("Dir::State::Lists") + "lock"));
 +      if (_error->PendingError() == true)
 +        return _error->Error(_("Unable to lock the list directory"));
 +   }
 +   
     CacheFile Cache;
     if (Cache.OpenForInstall() == false || 
         Cache.CheckDeps(CmdL.FileSize() != 1) == false)