summaryrefslogtreecommitdiff
path: root/apt-pkg/cachefile.cc
diff options
context:
space:
mode:
authorDavid Kalnischkies <david@kalnischkies.de>2016-02-10 12:26:49 +0100
committerDavid Kalnischkies <david@kalnischkies.de>2016-02-10 13:03:00 +0100
commitb6f1b480164b454661ddd4fdd3968302c6a3ebf6 (patch)
tree8f248eb30e77665d51788e7c4b807192187a524e /apt-pkg/cachefile.cc
parenteda0c1ba43cd3ae0ed85aba2c31573f156cec9c4 (diff)
get dpkg lock in build-dep if cache was invalid again
Regression introduced in a249b3e6fd798935a02b769149c9791a6fa6ef16, which in the case of an invalid cache would build the first part unlocked and later pick up the (still unlocked) cache for further processing, so the system got never locked and apt would end up complaining about being unable to release the lock at shutdown. The far more common case of having a valid cache worked as expected and hence covered up the problem – especially as tests who would have noticed it are simulations only, which do not lock. Closes: 814139 Reported-By: Balint Reczey <balint@balintreczey.hu> Reported-By: Helmut Grohne <helmut@subdivi.de> on IRC
Diffstat (limited to 'apt-pkg/cachefile.cc')
-rw-r--r--apt-pkg/cachefile.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/apt-pkg/cachefile.cc b/apt-pkg/cachefile.cc
index 6db0749d4..909da5cb4 100644
--- a/apt-pkg/cachefile.cc
+++ b/apt-pkg/cachefile.cc
@@ -238,6 +238,7 @@ bool pkgCacheFile::AddIndexFile(pkgIndexFile * const File) /*{{{*/
ExternOwner = false;
Map = NULL;
}
+ _system->UnLock(true);
return true;
}
/*}}}*/