cherry pick -r 1954..1955 lp:~donkult/apt/sid

diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index 8ecb683d4e0d8dca01280098d8d6a761c9c83c34..18c731788f2a3a020f07dcf80d138334248fb898 100644 (file)
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -575,35 +575,37 @@ void pkgDPkgPM::WriteHistoryTag(FILE *history_out, string tag, string value)
 // DPkgPM::OpenLog                                                     /*{{{*/
 bool pkgDPkgPM::OpenLog()
 {
 // DPkgPM::OpenLog                                                     /*{{{*/
 bool pkgDPkgPM::OpenLog()
 {

-   string logdir = _config->FindDir("Dir::Log");
+   string const logdir = _config->FindDir("Dir::Log");

    if(not FileExists(logdir))
       return _error->Error(_("Directory '%s' missing"), logdir.c_str());
 
    // get current time
    char timestr[200];
    if(not FileExists(logdir))
       return _error->Error(_("Directory '%s' missing"), logdir.c_str());
 
    // get current time
    char timestr[200];

-   time_t t = time(NULL);
-   struct tm *tmp = localtime(&t);
+   time_t const t = time(NULL);
+   struct tm const * const tmp = localtime(&t);

    strftime(timestr, sizeof(timestr), "%F  %T", tmp);
 
    // open terminal log
    strftime(timestr, sizeof(timestr), "%F  %T", tmp);
 
    // open terminal log

-   string logfile_name = flCombine(logdir,
+   string const logfile_name = flCombine(logdir,

                                   _config->Find("Dir::Log::Terminal"));
    if (!logfile_name.empty())
    {
       term_out = fopen(logfile_name.c_str(),"a");
       if (term_out == NULL)
                                   _config->Find("Dir::Log::Terminal"));
    if (!logfile_name.empty())
    {
       term_out = fopen(logfile_name.c_str(),"a");
       if (term_out == NULL)

-        return _error->WarningE(_("Could not open file '%s'"), logfile_name.c_str());
+        return _error->WarningE("OpenLog", _("Could not open file '%s'"), logfile_name.c_str());

 
       chmod(logfile_name.c_str(), 0600);
       fprintf(term_out, "\nLog started: %s\n", timestr);
    }
 
 
       chmod(logfile_name.c_str(), 0600);
       fprintf(term_out, "\nLog started: %s\n", timestr);
    }
 

-   // write 
-   string history_name = flCombine(logdir,
+   // write your history
+   string const history_name = flCombine(logdir,

                                   _config->Find("Dir::Log::History"));
    if (!history_name.empty())
    {
       FILE *history_out = fopen(history_name.c_str(),"a");
                                   _config->Find("Dir::Log::History"));
    if (!history_name.empty())
    {
       FILE *history_out = fopen(history_name.c_str(),"a");

+      if (history_out == NULL)
+        return _error->WarningE("OpenLog", _("Could not open file '%s'"), history_name.c_str());

       chmod(history_name.c_str(), 0644);
       fprintf(history_out, "\nStart-Date: %s\n", timestr);
       string remove, purge, install, upgrade, downgrade;
       chmod(history_name.c_str(), 0644);
       fprintf(history_out, "\nStart-Date: %s\n", timestr);
       string remove, purge, install, upgrade, downgrade;

diff --git a/debian/changelog b/debian/changelog
index 5f5a43098b21f11469275802b78c9f47c9d85a44..b26f1815335bb76914ae9c10c2df1321f1ad272a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ apt (0.7.25.3ubuntu4) UNRELEASED; urgency=low
       LP: #540228
   * cmdline/apt-get.cc, apt-pkg/cdrom.cc:
    - fix memory leaks in error conditions in DoSource()
       LP: #540228
   * cmdline/apt-get.cc, apt-pkg/cdrom.cc:
    - fix memory leaks in error conditions in DoSource()

+  * apt-pkg/deb/dpkgpm.cc:
+   - fix error message construction in OpenLog()

   
  -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 26 Mar 2010 16:57:49 +0100
 
   
  -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 26 Mar 2010 16:57:49 +0100