diff options
| author | Julian Andres Klode <jak@debian.org> | 2019-02-01 14:40:06 +0000 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2019-02-01 14:40:06 +0000 |
| commit | d5dcc2e9d3008b57c3fae0bcb5b1c2a197f5430c (patch) | |
| tree | 18472bd719bbd40e687d58f09c578382ae6a72ac /apt-pkg/contrib/fileutl.cc | |
| parent | b358bd64fc537de4e25c25b79de87346ec51a50c (diff) | |
| parent | 8aa2053368d1bb82755164eaa36a10410b434c7c (diff) | |
Merge branch 'pu/refuseunsignedlines' into 'master'
Fail if InRelease or Release.gpg contain unsigned lines
See merge request apt-team/apt!45
Diffstat (limited to 'apt-pkg/contrib/fileutl.cc')
| -rw-r--r-- | apt-pkg/contrib/fileutl.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index eab05de4f..8cb4b509c 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -3114,7 +3114,7 @@ FileFd* GetTempFile(std::string const &Prefix, bool ImmediateUnlink, FileFd * co snprintf(fn, sizeof(fn), "%s/%s.XXXXXX", tempdir.c_str(), Prefix.c_str()); int const fd = mkstemp(fn); - if(ImmediateUnlink) + if (ImmediateUnlink) unlink(fn); if (fd < 0) { @@ -3130,6 +3130,8 @@ FileFd* GetTempFile(std::string const &Prefix, bool ImmediateUnlink, FileFd * co delete Fd; return nullptr; } + if (ImmediateUnlink == false) + Fd->SetFileName(fn); return Fd; } /*}}}*/ |