apt/apt-pkg/contrib/configuration.cc, branch 1.5Debians commandline package managerhttps://git.kalnischkies.de/apt/atom?h=1.52017-07-26T17:09:04Zshow warnings instead of errors if files are unreadable2017-07-26T17:09:04ZDavid Kalnischkiesdavid@kalnischkies.de2017-07-15T13:08:35Zurn:sha1:51751106976b1c6afa8f7991790db87b239fcc84
We used to fail on unreadable config/preferences/sources files, but at
least for sources we didn't in the past and it seems harsh to refuse to
work because of a single file, especially as the error messages are
inconsistent and end up being silly (like suggesting to run apt update
to fix the problem…).
LP: #1701852
use FileFd to parse all apt configuration files2017-07-26T17:09:04ZDavid Kalnischkiesdavid@kalnischkies.de2017-07-15T12:12:50Zurn:sha1:3317ad864c997f4897756c0a2989c4199e9cda62
Using different ways of opening files means we have different behaviour
and error messages for them, so by the same for all we can have more
uniformity for users and apt developers alike.
Reformat and sort all includes with clang-format2017-07-12T11:57:51ZJulian Andres Klodejak@debian.org2017-07-12T11:40:41Zurn:sha1:87274d0f22e1dfd99b2e5200e2fe75c1b804eac3
This makes it easier to see which headers includes what.
The changes were done by running
git grep -l '#\s*include' \
| grep -E '.(cc|h)$' \
| xargs sed -i -E 's/(^\s*)#(\s*)include/\1#\2 include/'
To modify all include lines by adding a space, and then running
./git-clang-format.sh.
avoid malloc if option whitelist is disabled (default)2017-01-27T20:06:09ZDavid Kalnischkiesdavid@kalnischkies.de2017-01-27T11:30:13Zurn:sha1:2f8f58512dbb478f23149b57d33f788c26c04445
Config options are checked in various paths, so making "useless" memory
allocations wastes time and can also cause problems like #852757.
The unneeded malloc was added in ae73a2944a89e0d2406a2aab4a4c082e1e9da3f9.
(We have no explicit malloc here – its std:string doing this internally)
fix various typos reported by spellintian2017-01-19T14:59:38ZDavid Kalnischkiesdavid@kalnischkies.de2017-01-19T14:14:19Zurn:sha1:93cff633a830e222693fc0f3d78e6e534d1126ee
Most of them in (old) code comments. The two instances of user visible
string changes the po files of the manpages are fixed up as well.
Gbp-Dch: Ignore
Reported-By: spellintian
allow warning generation for non-whitelisted options2016-12-31T17:24:12ZDavid Kalnischkiesdavid@kalnischkies.de2016-12-31T17:24:12Zurn:sha1:ae73a2944a89e0d2406a2aab4a4c082e1e9da3f9
The idea is simple: Each¹ Find*( call starts with a call check if the
given option (with the requested type) exists in the whitelist. The
whitelist is specified via our configure-index file so that we have
a better chance at keeping it current. the whitelist is loaded via a
special (undocumented for now) configuration stanza and if none is
loaded the empty whitelist will make it so that no warnings are shown.
Much needs to be done still, but that is as good a time as any to take a
snapshot of the current state and release it into the wild given that it
found some bugs already and has no practical effect on users.
¹ not all in this iteration, but many
ensure Cnf::FindFile doesn't return files below /dev/null2016-07-19T16:05:13ZDavid Kalnischkiesdavid@kalnischkies.de2016-07-19T16:05:13Zurn:sha1:bbd8308cc01941e51e2cbcf88168a5560abe6042
Very unlikely, but if the parent is /dev/null, the child empty and the
grandchild a value we returned /dev/null/value which doesn't exist, so
hardly a problem, but for best operability we should be consistent in
our work and return /dev/null always.
remove 100-levels config nesting limit2016-05-03T11:49:45ZDavid Kalnischkiesdavid@kalnischkies.de2016-05-02T16:18:37Zurn:sha1:6afe25b56467b228fdd7c045d1062b12c0408e7c
The actual reason for this commit isn't the limit – there isn't much
point in using that much nesting – its in shutting up gcc mostly:
apt/apt-pkg/contrib/configuration.cc: In function ‘bool ReadConfigFile(Configuration&, const string&, const bool&, const unsigned int&)’:
apt/apt-pkg/contrib/configuration.cc:686:20: warning: cannot optimize loop, the loop counter may overflow [-Wunsafe-loop-optimizations]
string Stack[100];
^
by replacing this with C++s handy std::stack container (adapter).
Also cleans some whitespace noise from the file in the process.
add binary-specific options via Binary scope2015-11-04T17:04:02ZDavid Kalnischkiesdavid@kalnischkies.de2015-10-16T16:03:52Zurn:sha1:c3ded84c6f99bda4caf63c8662416ffb0189d31b
Especially with apt now, it can be useful to set an option only for apt
and not for apt-get. Using a binary-specific subtree which is merged into
the root seems like a simple enough trick to achieve this.
remove the compatibility markers for 4.13 abi2015-08-10T15:27:58ZDavid Kalnischkiesdavid@kalnischkies.de2015-07-15T11:21:21Zurn:sha1:4dc77823d360158d6870a5710cc8c17064f1308f
We aren't and we will not be really compatible again with the previous
stable abi, so lets drop these markers (which never made it into a
released version) for good as they have outlived their intend already.
Git-Dch: Ignore