diff options
| author | Michael Vogt <mvo@debian.org> | 2014-01-25 22:40:04 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-01-25 22:40:04 +0100 |
| commit | 6fa5b7b71e5c8ec5d4bec7bec3ef311c4d9c826b (patch) | |
| tree | a02ec2b10f30e713eedd3f7c63cc44051fb6c859 /apt-private/private-sources.cc | |
| parent | 72af508bdbca55d0752aab3369faa1dc944a04e7 (diff) | |
| parent | 9aef3908c892f9d9349d8bf8a5ceaeea313ba0fe (diff) | |
Merge branch 'debian/sid' into ubuntu/master
Conflicts:
configure.ac
Diffstat (limited to 'apt-private/private-sources.cc')
| -rw-r--r-- | apt-private/private-sources.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/apt-private/private-sources.cc b/apt-private/private-sources.cc index 65706e785..41cf6b313 100644 --- a/apt-private/private-sources.cc +++ b/apt-private/private-sources.cc @@ -32,6 +32,10 @@ bool EditSources(CommandLine &CmdL) if (FileExists(sourceslist)) before.FromFile(sourceslist); + int lockfd = GetLock(sourceslist); + if (lockfd < 0) + return false; + do { EditFileInSensibleEditor(sourceslist); _error->PushToStack(); @@ -46,6 +50,7 @@ bool EditSources(CommandLine &CmdL) } _error->RevertToStack(); } while (res == false); + close(lockfd); if (FileExists(sourceslist) && !before.VerifyFile(sourceslist)) { strprintf( |