APT

Merge lp:~matgnt/apt/ubuntu.bug535509 into lp:~ubuntu-core-dev/apt/ubuntu

  1. ubuntu.bug535509
  2. Merge into ubuntu
Proposed by Matthias G.
Status: Merged
Merged at revision: 1771
Proposed branch: lp:~matgnt/apt/ubuntu.bug535509
Merge into: lp:~ubuntu-core-dev/apt/ubuntu
Diff against target: 15 lines (+5/-0)
1 file modified
apt-pkg/deb/dpkgpm.cc (+5/-0)
To merge this branch: bzr merge lp:~matgnt/apt/ubuntu.bug535509
Reviewer Review Type Date Requested Status
Michael Vogt (community) Approve
Review via email: mp+26392@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Michael Vogt (mvo) wrote :

Thanks for the fix!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'apt-pkg/deb/dpkgpm.cc'
2--- apt-pkg/deb/dpkgpm.cc 2010-03-26 16:27:47 +0000
3+++ apt-pkg/deb/dpkgpm.cc 2010-05-30 21:43:24 +0000
4@@ -653,6 +653,11 @@
5 }
6 term_out = NULL;
7
8+ // check if the directory exists in which we want to write the file
9+ string const logdir = _config->FindDir("Dir::Log");
10+ if(not FileExists(logdir))
11+ return _error->Error(_("Directory '%s' missing"), logdir.c_str());
12+
13 string history_name = flCombine(_config->FindDir("Dir::Log"),
14 _config->Find("Dir::Log::History"));
15 if (!history_name.empty())

Subscribers

People subscribed via source and target branches

to all changes: