← Back to branch summary

~ubuntu-branches/debian/experimental/apt/experimental

« back to all changes in this revision

Viewing changes to apt-pkg/deb/debsystem.cc

  • Committer: Bazaar Package Importer
  • Author(s): Michael Vogt
  • Date: 2010-02-18 22:07:23 UTC
  • mfrom: (9.1.7 sid)
  • Revision ID: james.westby@ubuntu.com-20100218220723-zb7zdh6fmsmp30tr
Tags: 0.7.26~exp2
fix crash when LANGUAGE is not set

Show diffs side-by-side

added added

removed removed

Lines of Context:
apt-pkg/deb/debsystem.cc
10
10
   ##################################################################### */
11
11
                                                                        /*}}}*/
12
12
// Include Files                                                        /*{{{*/
13
 
#include <apt-pkg/deb/debsystem.h>
14
 
#include <apt-pkg/deb/debversion.h>
15
 
#include <apt-pkg/deb/debindexfile.h>
16
 
#include <apt-pkg/deb/dpkgpm.h>
17
 
#include <apt-pkg/contrib/configuration.h>
18
 
#include <apt-pkg/contrib/error.h>
19
 
#include <apt-pkg/contrib/fileutl.h>
 
13
#include <apt-pkg/debsystem.h>
 
14
#include <apt-pkg/debversion.h>
 
15
#include <apt-pkg/debindexfile.h>
 
16
#include <apt-pkg/dpkgpm.h>
 
17
#include <apt-pkg/configuration.h>
 
18
#include <apt-pkg/error.h>
 
19
#include <apt-pkg/fileutl.h>
20
20
#include <apti18n.h>
21
21
    
22
22
#include <sys/types.h>
67
67
   if (LockFD == -1)
68
68
   {
69
69
      if (errno == EACCES || errno == EAGAIN)
70
 
         return _error->Error("Unable to lock the administration directory (%s), "
71
 
                              "is another process using it?",AdminDir.c_str());
 
70
         return _error->Error(_("Unable to lock the administration directory (%s), "
 
71
                                "is another process using it?"),AdminDir.c_str());
72
72
      else
73
 
         return _error->Error("Unable to lock the administration directory (%s), "
74
 
                              "are you root?",AdminDir.c_str());
 
73
         return _error->Error(_("Unable to lock the administration directory (%s), "
 
74
                                "are you root?"),AdminDir.c_str());
75
75
   }
76
76
   
77
77
   // See if we need to abort with a dirty journal
79
79
   {
80
80
      close(LockFD);
81
81
      LockFD = -1;
82
 
      return _error->Error("dpkg was interrupted, you must manually "
83
 
                           "run 'dpkg --configure -a' to correct the problem. ");
 
82
      return _error->Error(_("dpkg was interrupted, you must manually "
 
83
                             "run 'dpkg --configure -a' to correct the problem. "));
84
84
   }
85
85
 
86
86
         LockCount++;