summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* replace c-string Mode with c++-string ActiveSubprocessDavid Kalnischkies2014-09-283-6/+57
| | | | | | | | | | | | | | | | | A long-lasting FIXME in the acquire code points out the problem that we e.g. for decompressors assign c-string representations of c++-strings to the Mode variable, which e.g. cppcheck points out as very bad. In practice, nothing major happens as the c++-strings do not run out of scope until Mode would do, but that is bad style and fragile, so the obvious proper fix is to use a c++ string for storage to begin with. The slight complications stems from the fact that progress reporting code in frontends potentially uses Mode and compares it with NULL, which can't be done with std::string, so instead of just changing the type we introduce a new variable and deprecate the old one. Git-Dch: Ignore
* allow options between command and -- on commandlineDavid Kalnischkies2014-09-283-10/+81
| | | | | | | This used to work before we implemented a stricter commandline parser and e.g. the dd-schroot-cmd command constructs commandlines like this. Reported-By: Helmut Grohne
* cleanup partial directory of lists in apt-get cleanDavid Kalnischkies2014-09-272-6/+54
| | | | | | | | Not really the intended usecase for apt-get clean, but users expect it to help them in recovery and it can't really hurt as this directory should be empty if everything was fine and proper anyway. Closes: #762889
* allow fetcher setup without directory creationDavid Kalnischkies2014-09-277-28/+66
| | | | | | | | | | | apt-get download and changelog as well as apt-helper reuse the acquire system for their own proposes without requiring the directories the fetcher wants to create, which is a problem if you run them as non-root and the directories do not exist as it greets you with: E: Archives directory /var/cache/apt/archives/partial is missing. - Acquire (13: Permission denied) Closes: 762898
* Japanese program translation updateKenshi Muto2014-09-271-30/+28
| | | | Closes: 763033
* store source name and version in binary cacheDavid Kalnischkies2014-09-277-53/+89
| | | | | | | Accessing the package records to acquire this information is pretty costly, so that information wasn't used so far in many places. The most noticeable user by far is EDSP at the moment, but there are ideas to change that which this commit tries to enable.
* fix: %i in format string (no. 1) requires 'int' but the argument type isDavid Kalnischkies2014-09-271-3/+3
| | | | | | | 'unsigned int' Git-Dch: Ignore Reported-By: cppcheck
* fix: The class 'pkgSourceList' defines member variable with name 'SrcList' ↵David Kalnischkies2014-09-271-4/+0
| | | | | | | also defined in its parent class 'pkgSource' Git-Dch: Ignore Reported-By: cppcheck
* fix: Prefer prefix ++/-- operators for non-primitive typesDavid Kalnischkies2014-09-273-6/+6
| | | | | Git-Dch: Ignore Reported-By: cppcheck
* fix: Consecutive return, break, continue, goto or throw statements are ↵David Kalnischkies2014-09-272-4/+1
| | | | | | | unnecessary. Git-Dch: Ignore Reported-By: cppcheck
* Merge branch 'feature/gnupglimit' into debian/experimentalDavid Kalnischkies2014-09-2759-529/+652
|\
| * add gnupg and gnupg2 as test-dependencyDavid Kalnischkies2014-09-272-2/+3
| | | | | | | | | | | | | | apt can work with both, so it has an or-dependency on them, but the tests want to play with both of them. Git-Dch: Ignore
| * ensure apt-key del handles 16-byte key idsJames McCoy2014-09-271-0/+8
| | | | | | | | | | | | | | The original patch does not apply against the rewritten apt-key, but an additional test doesn't hurt. Closes: 754436
| * remove empty keyrings in trusted.gpg.d on upgradeDavid Kalnischkies2014-09-271-0/+9
| | | | | | | | | | | | Adding and deleting many repositories could cause (empty) keyring files to pill up in older apt-key versions, which in the end might cause gnupg to run into its internal limit of at most 40 keyrings
| * add and use 'apt-key verify' which prefers gpgv over gpgDavid Kalnischkies2014-09-273-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | gnupg/gnupg2 can do verify just fine of course, so we don't need to use gpgv here, but it is what we always used in the past, so there might be scripts expecting a certain output and more importantly the output of apt-cdrom contains messages from gpg and even with all the settings we activate to prevent it, it still shows (in some versions) a quiet scary: "gpg: WARNING: Using untrusted key!" message. Keeping the use of gpgv is the simplest way to prevent it. We are increasing also the "Breaks: apt" version from libapt as it requires a newer apt-key than might be installed in partial upgrades.
| * miscellaneous small cleanups in apt-keyDavid Kalnischkies2014-09-271-17/+7
| | | | | | | | Git-Dch: Ignore
| * add --readonly option for apt-key advDavid Kalnischkies2014-09-273-7/+7
| | | | | | | | | | | | | | | | Some advanced commands can be executed without the keyring being modified like --verify, so this adds an option to disable the mergeback and uses it for our gpg calling code. Git-Dch: Ignore
| * use only one --keyring in gpg interactionsDavid Kalnischkies2014-09-272-46/+116
| | | | | | | | | | | | | | | | | | We were down to at most two keyrings before, but gnupg upstream plans dropping support for multiple keyrings in the longrun, so with a single keyring we hope to be future proof – and 'apt-key adv' isn't a problem anymore as every change to the keys is merged back, so we have now the same behavior as before, but support an unlimited amount of trusted.gpg.d keyrings.
| * add --secret-keyring option for apt-keyDavid Kalnischkies2014-09-272-3/+14
| | | | | | | | | | | | | | | | | | For some advanced usecases it might be handy to specify the secret keyring to be used (e.g. as it is used in the testcases), but specifying it via a normal option for gnupg might not be available forever: http://lists.gnupg.org/pipermail/gnupg-users/2013-August/047180.html Git-Dch: Ignore
| * allow to specify fingerprints in 'apt-key del'David Kalnischkies2014-09-273-5/+26
| |
| * add a test for apt-key export{,all}David Kalnischkies2014-09-272-2/+9
| | | | | | | | Git-Dch: Ignore
| * use apt-key to wrap gpg calls in testcasesDavid Kalnischkies2014-09-271-31/+9
| | | | | | | | | | | | | | beside testing apt-key a bit it also avoids duplicating gpghome setup code in apt-key and the test framework Git-Dch: Ignore
| * respect --keyring also in merged keyring commandsDavid Kalnischkies2014-09-271-8/+10
| | | | | | | | Git-Dch: Ignore
| * support gnupg2 as drop-in replacement for gnupgDavid Kalnischkies2014-09-273-88/+122
| | | | | | | | | | | | If both are available APT will still prefer gpg over gpg2 as it is a bit more lightweight, but it shouldn't be a problem to use one or the other (at least at the moment, who knows what will happen in the future).
| * delay gnupg setup in apt-key until it is neededDavid Kalnischkies2014-09-271-22/+22
| | | | | | | | | | | | 'apt-key help' and incorrect usage do not need a functioning gnupg setup, as well as we shouldn't try to setup gnupg before we actually test if it is available (and print a message if it is not).
| * correct the error messages to refer to apt-key instead of gpgvDavid Kalnischkies2014-09-2746-180/+173
| | | | | | | | Git-Dch: Ignore
| * use apt-key adv (+ gnupg) instead of gpgv for verifyDavid Kalnischkies2014-09-275-47/+53
| | | | | | | | | | | | | | | | apt-key does the keyring merge as we need it, so we just call it instead of reimplementing it to do the merging before gpgv. This means we don't use gpgv anymore (we never depended on it explicitly - bad style), but it also means that the message in apt-cdrom add is a bit less friendly as it says loudly "untrusted key", but for a one-time command its okay.
| * merge fragment keyrings in apt-key to avoid hitting gpg limitsDavid Kalnischkies2014-09-271-57/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | gnupg has a hardlimit of 40 (at the moment) keyrings per invocation, which can be exceeded with (many) repositories. That is rather misfortune as the longrun goal was to drop gnupg dependency at some point in the future, but this can now be considered missed and dropped. It also means that 'apt-key adv' commands might not have the behaviour one would expect it to have as it mainly operates on a big temporary keyring, so commands modifying keys will break. Doing this was never a good idea anyway through, so lets just hope nothing break too badly. Closes: 733028
| * refactor key removal code to reuse it in next stepDavid Kalnischkies2014-09-271-48/+55
| | | | | | | | Git-Dch: Ignore
| * set a primary-keyring only if we have access to itDavid Kalnischkies2014-09-271-1/+3
| |
| * support (multiple) arguments properly in apt-keyDavid Kalnischkies2014-09-271-27/+27
| |
| * only create new trusted.gpg if directory is writeableDavid Kalnischkies2014-09-271-23/+14
| |
| * all errors should be printed to stderrDavid Kalnischkies2014-09-271-5/+5
| | | | | | | | Git-Dch: Ignore
| * add a (hidden) --quiet option for apt-keyDavid Kalnischkies2014-09-271-4/+10
| |
| * rename postrm to apt.postrmDavid Kalnischkies2014-09-273-39/+0
| | | | | | | | | | | | | | | | | | | | It helps in identifying its affiliation. Also removes the old postinst which was hidden by apt.postinst for a long time now and would just install a sources.list in edgecases which is probably not a good idea (e.g. on my system /etc/apt/sources.list does not exist). It is better done by the installer of the distro. Git-Dch: Ignore
| * remove leftover debug output from multikey softlinkDavid Kalnischkies2014-09-271-1/+0
|/ | | | Git-Dch: Ignore
* fix: warning: extra ‘;’ [-Wpedantic]David Kalnischkies2014-09-275-13/+13
| | | | | Reported-By: gcc -Wpedantic Git-Dch: Ignore
* fix: Member variable 'X' is not initialized in the constructor.David Kalnischkies2014-09-2713-32/+29
| | | | | Reported-By: cppcheck Git-Dch: Ignore
* fix occurrence typo in tagfile commentDavid Kalnischkies2014-09-271-1/+1
| | | | | Reported-By: codespell Git-Dch: Ignore
* remove outdated and unused po/ChangeLogDavid Kalnischkies2014-09-271-1077/+0
| | | | Git-Dch: Ignore
* add an API for cache filters/matcherDavid Kalnischkies2014-09-272-52/+209
| | | | | | | | | | A lot of code deals with iterating over packages and checking for specific states. At the moment these are all handcrafted inplace, but that makes sharing common code which just differs in the states it checks rather difficult and is error prune. Having an API to construct arbitrary complex filters will come in handy for those. Git-Dch: Ignore
* move PCI::From* methods into CacheSetHelper classDavid Kalnischkies2014-09-272-87/+139
| | | | | | | | | | | | | | The methods itself deal with the helper a lot, so it makes sense to move them to the helper itself, which helps also if we want to override some of these methods, the FromString mentioned in the bugreport being the obvious example. VCI is spared from this change for now as while it would fit with the same reasoning it much heavier entangled with the previous CacheSetHelper change, so moving it now would mean breaking the API. The PCI change is worthwhile on its own though as it is used by VCI. Closes: 686221
* adapt to the new CacheSetHelper APIDavid Kalnischkies2014-09-274-26/+23
| | | | Git-Dch: Ignore
* rework cachesets API to allow future extensionDavid Kalnischkies2014-09-274-154/+494
| | | | | | | | | | | | | | | The introduction of Fnmatch showed that each new selector would require multiple new virtual methods in the CacheSetHelper to work correctly, which isn't that great. We now flip to a single virtual method which handles all cases separated by an enum – as new enum values can be added without an ABI break. Great care was taken to make old code work with the new way of organisation, which means in return that you might be bombarded with deprecation warnings now if you don't adapt, but code should still compile and work as before as can be seen in apt itself with this commit. Git-Dch: Ignore
* add APT::PackageUniverse as a pkgCache wrapperDavid Kalnischkies2014-09-271-0/+38
| | | | Git-Dch: Ignore
* add specialisations for std::vectorDavid Kalnischkies2014-09-271-2/+73
| | | | Git-Dch: Ignore
* mark pkg(All|Dist)Upgrade as deprecatedDavid Kalnischkies2014-09-276-16/+21
| | | | | | | | The comment above their definition marks them already as such, so this is only a formalisation of the deprecation and fixes the occurances we have in our own code together with removing a magic number. Git-Dch: Ignore
* fix progress output for (dist-)upgrade calculationDavid Kalnischkies2014-09-2773-148/+223
| | | | | | | | | | | | | | | | | Previously, we had a start and a done of the calculation printed by higher-level code, but this got intermixed by progress reporting from an external solver or the output of autoremove code… The higherlevel code is now only responsible for instantiating a progress object of its choosing (if it wants progress after all) and the rest will be handled by the upgrade code. Either it is used to show the progress of the external solver or the internal solver will give some hints about its overall progress. The later isn't really a proper progress as it will jump forward after each substep, but that is at least a bit better than before without any progress indication. Fixes also the 'strange' non-display of this progress line in -q=1, while all others are shown, which is reflected by all testcase changes.
* de-duplicate version strings in the cacheDavid Kalnischkies2014-09-271-3/+3
| | | | | | | | | | | | | | | Turns out that version numbers aren't as random as you might guess. In my cache for example, I have: Total package names: 69513 (1390 k) Total package structures: 188259 (9036 k) Total distinct versions: 186345 (13.4 M) Total dependencies: 2052242 (57.5 M) which amounts to 1035873 (10,1 M) strings. Reusing version strings reduces this to 161465 (3.479 k). This comes at a cost of course: Generation is slightly slower, but we are still faster than what we started with and it makes room (also cache size wise) for further changes.
* drop stored StringItems in favor of in-memory mappingsDavid Kalnischkies2014-09-278-124/+57
| | | | | | | | | | | | | | | Strings like Section names or architectures are needed vary often. Instead of writing them each time we need them, we deploy sharing for these special strings. Until now, this was done with a linked list of strings in which we would search, which was stored in the cache. It turns out we can do this just as well in memory as well with a bunch of std::map's. In memory means here that it isn't available anymore if we have a partly invalid cache, but that isn't much of a problem in practice as the status file is compared to the other files we parse very small and includes mostly duplicates, so the space we would gain by storing is more or less equal to the size of the stored linked list…