apt/apt-pkg/deb, branch 2.1.5Debians commandline package managerhttps://git.kalnischkies.de/apt/atom?h=2.1.52020-05-25T10:05:00ZSilence clang warning -Wstring-plus-int2020-05-25T10:05:00ZDavid Kalnischkiesdavid@kalnischkies.de2020-05-24T14:36:03Zurn:sha1:c3bfdbfa3ae868515a67142d2df6200a3cb34d35
../apt-pkg/init.cc:137:39: warning: adding 'int' to a string does not append to the string [-Wstring-plus-int]
Cnf.CndSet("Dir::State", STATE_DIR + 1);
../apt-pkg/init.cc:137:39: note: use array indexing to silence this warning
We have a few instances of that & it should be reasonably clear that we are not
actually trying to append here, but ignoring or silencing this warning with an
override is far more costly than just using what clang suggests here.
Reported-By: clang
Gbp-Dch: Ignore
Parse last line in deb file correctly by adding a newline2020-03-21T07:35:26ZDavid Kalnischkiesdavid@kalnischkies.de2020-03-21T07:14:15Zurn:sha1:bf46e09f0e4b52b3c71ac20bb11e7511fc16179f
While merging apt-pkg and apt-inst libraries the codepath of handling
deb files in apt-pkg was adapted to use the 'old' code from apt-inst
instead of fork&exec of dpkg-deb -I. The information we get this way
forms the main part of the package stanza, but we add a few
semi-optional fields to the stanza to make it look and work more
like a stanza we got from a repository.
Just be careful with the area where these two parts touch as if,
hypothetically, we would stip all newlines around the parts,
but forget to add a newline between them later, the two lines around
the merge would stick a bit too close together forming one which could
result in fun parsing errors if this merged line was previously e.g. a
well-formed Depends line and has now extra fluff attached.
This codepath has a history with too many newlines (#802553) though,
so how likely is it really that it will some day lack one you may ask.
References: 6089a4b17c61ef30b2efc00e270b0907f51f352a
Show absolute time while waiting for lock instead of %, rework message2020-03-06T12:14:37ZJulian Andres Klodejulian.klode@canonical.com2020-03-06T12:10:04Zurn:sha1:1b81f6bd13bb31e59da3f53cfdc7caab43abf887
Showing a percentage for a timeout is pretty non-standard. Rework the
progress class so it can show an absolute progress (currently hardcoded
to use seconds as a unit). If there is a timeout (aka if it's not the
maximum long long unsigned -1llu), then show the timeout, otherwise
just count up seconds, e.g.
Waiting for cache lock: Could not get lock /var/lib/dpkg/lock-frontend. It is held by process 33842 (apt)... 1/120s
or
Waiting for cache lock: Could not get lock /var/lib/dpkg/lock-frontend. It is held by process 33842 (apt)... 1s
Also improve the error message to use "Waiting for cache lock: %s" instead of "... (%s)", as having
multiple sentences inside parenthesis is super weird, as is having two closing parens.
We pass the information via _config, as that's reasonably easy and avoids
ABI hackage. It also provides an interesting debugging tool for other
kinds of progress.
(temporarily) unhide pkgDPkgPM again to have python-apt compile2020-02-27T08:45:50ZJulian Andres Klodejulian.klode@canonical.com2020-02-27T08:45:50Zurn:sha1:edef1b7713265a47ce762593022dadc2de2fc6f1apt(8): Wait for frontend and cache lock2020-02-26T19:36:52ZJulian Andres Klodejulian.klode@canonical.com2020-02-26T19:31:03Zurn:sha1:93e1565796b61eb44bec39f50e09a34cbe090178
This is a rework of !6 with additional stuff for the frontend
lock, so we can lock the frontend lock and then keep looping
over dpkg lock.
apt-pkg: default visibility to hidden2020-02-26T19:34:54ZJulian Andres Klodejulian.klode@canonical.com2019-08-13T17:15:19Zurn:sha1:db678df196ccd8f9f6fb336706cf5701d1e53aa6Make metaIndex::GetNotBefore virtual2020-02-26T13:32:36ZJulian Andres Klodejulian.klode@canonical.com2020-02-26T13:32:36Zurn:sha1:43b418a68d8e64b4f0220e730ccf7441e2796ea6pkgsystem: Drop more virtual workaround shenanigans2020-02-26T13:30:03ZJulian Andres Klodejulian.klode@canonical.com2020-02-26T13:29:06Zurn:sha1:da7de99f8473ae0ac90c90fad3eee80f5f72889ametaindex: Add Origin, Label, Version, DefaultPin, ReleaseNotes members2020-02-26T13:19:10ZJulian Andres Klodejulian.klode@canonical.com2020-02-26T13:19:10Zurn:sha1:d77c1c7db760ae21d703b8b0f129379e54918bf7
These were hidden behind the d-pointer previously.
Remove various dynamic_cast uses, use virtual methods instead2020-02-26T13:16:17ZJulian Andres Klodejulian.klode@canonical.com2020-02-26T13:15:24Zurn:sha1:d31f807a8d3f031d5efc5c3be9b76f9a9ac22d5d