summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Release 2.9.62.9.6Julian Andres Klode2024-07-025-6/+22
|
* Merge branch 'solver3' into 'main'Julian Andres Klode2024-07-022-21/+35
|\ | | | | | | | | Fixes for the Obsolete handling See merge request apt-team/apt!361
| * solver3: Formatting cleanupJulian Andres Klode2024-07-021-8/+8
| | | | | | | | Run clang-format
| * solver3: Only demote obsolete packages in choices for upgradesJulian Andres Klode2024-07-021-2/+3
| | | | | | | | | | If we are not upgraded, we should continue to keep the installed package installed if possible.
| * solver3: Consider packages as obsolete and not versionsJulian Andres Klode2024-07-022-13/+26
|/ | | | | | | | | | | | | This makes more sense, as all package versions are obsolete that are not the candidate, usually. Pay special attention to no-strict-pinning: If we don't have strict pinning, a package without a candidate version may still be non-obsolete if the latest version is not obsolete. Likewise, in no-strict-pinning any later source version that exists will cause the package to be considered obsolete, rather than just candidates.
* Merge branch 'solver3-refactor-from' into 'main'Julian Andres Klode2024-07-015-41/+60
|\ | | | | | | | | Rewrite the FromDepCache method to be smaller and more correct See merge request apt-team/apt!360
| * solver3: Refactor (rewrite) FromDepCache()Julian Andres Klode2024-07-015-41/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor the various Install requests into a single one and move some stuff around, this should be a bit easier to maintain and we don't repeat ourselves all the time. This accidentally uncovered some bugs in the code, that get fixed by this: - The UpgradeManual and InstallManual groups did not work correctly, Essential packages were Install and others were Upgrade. - Automatically installed packages falsely got promoted to the manual groups as they got promoted into the manual code path, whenever we ran without allowing their removal. - The combination of --mark-auto --auto-remove now works correctly We previously skipped the installation of automatically installed packages when we did autoremoval, but we did not consider if the action was protected, that is specified on the command-line. Now we do not autoremove protected actions, and have added a test case for it. - The AllowRemoveManual option no longer is applied if removals are generally denied. Closes: #1071519
| * solver3: Unmark packages before setting any in ToDepCacheJulian Andres Klode2024-07-011-0/+2
|/ | | | | | We should set the Mark/Garbage flags for all packages so we don't end up in an inconsistent state, so reset the flags for each package before evaluating further.
* Merge branch 'solver3-replaces-are-not-really-deps' into 'main'Julian Andres Klode2024-07-012-1/+68
|\ | | | | | | | | solver3: Do not accidentally promote Replaces and Enhances to dependencies See merge request apt-team/apt!359
| * solver3: Do not accidentally promote Replaces and Enhances to dependenciesJulian Andres Klode2024-07-012-1/+68
|/ | | | | | | | | | As part of the refactoring, we allowed the code to work on unimportant dependencies as we needed to promote Suggests to Depends if they are currently satisfied. However, Replaces and Enhances were not considered properly and both are not negative dependencies so they were accidentally promoted to Depends too if they were currently satisfied.
* Release 2.9.52.9.5Julian Andres Klode2024-06-1315-53/+110
|
* Merge branch 'snapshot-typo' into 'main'Julian Andres Klode2024-06-131-1/+1
|\ | | | | | | | | Fix spelling of @SNAPSHOTID@ in apt.conf.5.xml See merge request apt-team/apt!353
| * Fix spelling of @SNAPSHOTID@ in apt.conf.5.xmlNoah Meyerhans2024-05-291-1/+1
| | | | | | | | Closes: #1072189
* | Merge branch 'edsp-source-version' into 'main'Julian Andres Klode2024-06-132-1/+15
|\ \ | | | | | | | | | | | | edsp: Parse source version from the Source-Version field See merge request apt-team/apt!354
| * | edsp: Parse source version from the Source-Version fieldJulian Andres Klode2024-05-302-1/+15
| |/ | | | | | | | | | | | | | | | | EDSP uses the Source-Version field instead of storing the source version in the Source field with the package name, adjust our parser accordingly. Use the override in the edspLikeListParser to do so rather than dumb this into the correct place in the debListParser.
* | Merge branch 'solver3-group' into 'main'Julian Andres Klode2024-06-134-59/+123
|\ \ | | | | | | | | | | | | solver3: Group work items; and helpers See merge request apt-team/apt!356
| * | solver3: Order obsolete choices lastJulian Andres Klode2024-06-133-8/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This has two aspects: 1. For a dependency A | B | C we order the obsolete packages last, that is, if A is obsolete, this gets reordered to B | C | A, such that we try to pick non-obsolete packages first to ease upgrade calculation. 2. When comparing two dependencies, we order dependencies into three groups: First we satisfy dependencies mentioning only non-installed (NEW) packages, then we satisfy "normal" dependencies, and finally we satisfy any dependencies mentioning obsolete packages. This means for example if you have obsolete libfoo1 and a new libfoo1t64, that we will see Depends: libfoo1t64 before any Depends: libfoo1 (which may expand to libfoo1 | libfoo1t64), so we effectively will have selected "replacement" packages this way already before getting to older packages where we would have to choose between the obsolete package and its replacement.
| * | solver3: Remove no longer necessary comparisonsJulian Andres Klode2024-06-131-22/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Comparing the size of work items is not strictly needed; we check if items have a single or no solution and propagate them early on, but it doesn't matter much if we solve A|B or C|D|E first. This will allow us to get rid of all the resizing business later on, and switch to using literal watching where we only watch one of the literals on the right hand side. Likewise, the upgrade case mattered initially in testing, but seems to have resolved itself.
| * | solver3: Group work itemsJulian Andres Klode2024-06-132-27/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Our backtracking is chronological, so we will first try alternative choices or skip optional items in later groups. So installing manually installed packages before automatically installed ones allows manually installed packages to remove automatically installed packages easily. If we did automatic packages first, we'd keep back upgrades for manual packages or change choices for their dependencies, or would have to backtrack harder to get back to the right decision level. That's silly. Ordering automatically installed packages last also allows us to calculate autoremovable packages. Since we will have installed all dependencies from manually installed packages by the point where we get to automatically installed packages, everything that will be installed in those Auto groups is inherently garbage.
| * | solver3: Do not dump sizes that are clearly pointersJulian Andres Klode2024-06-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | We use a union here, but we don't know if we last stored a pointer, so let's just reject clearly non-sizes. Generally this will work fine -- you will not have enough choices in a dependency that you can construct a valid pointer to a Version*, especially given that any Version * > sizeof(pkgCache::Header) already, given it is in the cache.
| * | Make the failure mode for non-executable tests strongerJulian Andres Klode2024-06-131-1/+1
|/ / | | | | | | | | | | | | | | | | When a test-* file is created but not executable, we'd ignore the argument and then our subprocess would run the entire test suite itself, sequentially. Silly. Let's just see if the file exists instead, then the test will fail.
* | Merge branch 'gpgv-options' into 'main'Julian Andres Klode2024-06-131-12/+2
|\ \ | | | | | | | | | | | | Check gpgv --dump-options for --assert-pubkey-algo support See merge request apt-team/apt!355
| * | Check gpgv --dump-options for --assert-pubkey-algo supportJulian Andres Klode2024-06-131-12/+2
|/ / | | | | | | | | | | | | This avoids the fragile --help check. This option is not documented in the manual page but seems to be there. Thanks: Justus Winter for the idea
* | Dutch manpages translation updateFrans Spiesschaert2024-06-111-48/+36
| | | | | | | | Closes: #1072494
* | Dutch program translation updateFrans Spiesschaert2024-06-111-8/+10
|/ | | | Closes: #1072493
* Merge branch 'user-ci-fixes' into 'main'Julian Andres Klode2024-05-283-6/+8
|\ | | | | | | | | CI: Set /bin/sh shell for travis user, so flock -c works See merge request apt-team/apt!351
| * Fix test cases for non-amd64 architecturesJulian Andres Klode2024-05-282-5/+7
| | | | | | | | | | | | These got broken by the recent solver3 changes by accident, and we did not notice as I also broke the test suite detection with the new statistics feature, hooray.
| * CI: Set /bin/sh shell for travis user, so flock -c worksJulian Andres Klode2024-05-271-1/+1
|/ | | | This is awkward.
* Release 2.9.42.9.4Julian Andres Klode2024-05-2548-226/+514
|
* Merge branch 'solver3' into 'main'Julian Andres Klode2024-05-2558-112/+751
|\ | | | | | | | | solver3: Run the test suite, at least the passing tests + some fixes. See merge request apt-team/apt!349
| * solver3: Fix translations of removals for marked installJulian Andres Klode2024-05-243-2/+2
| | | | | | | | | | | | | | | | | | We also need to issue a MarkDelete() if the package is marked for installation currently but should not be, not only if it did not have a previous version. This fixes the final test in test-multiarch-barbarian, the others only needed adjustments to mark all packages as automatic.
| * solver3: Actually restore unsolved items rather than solved onesJulian Andres Klode2024-05-243-9/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When restoring previously solved items, we try to restore items that have become unsolved again by skipping items that have a solved solution. Well at least we thought we did, but we accidentally had a "not" in there that inverted the meaning, hence we lost work items on backtracking. This mostly did not seem to have caused any issues, I stumbled over it while trying to add `autoremove` listings to `upgrade`, but fixing it also fixes: test-ubuntu-bug-1130419-prefer-installed-ma-same-siblings This used to say "E: Broken packages", meaning the solver lost a non-optional install request and the 2nd stage solver caught an incomplete solution. Also test-bug-735967-lib32-to-i386-unavailable restores the legacy solver behavior, so win win?
| * solver3: Use stable sortJulian Andres Klode2024-05-241-5/+5
| | | | | | | | | | | | | | | | | | | | While it seems that libstdc++ is using stable_sort for sort, we should make this explicit: We don't want items in our queues to move ahead of earlier items of the same priority. i.e. consider dependencies, they are grouped by package, we don't want the sort algorithm to move B=2 ahead if A|B (which expands to A=2|A=1|B=2|B=1).
| * solver3: Solve optional dependencies before optional packagesJulian Andres Klode2024-05-243-1/+3
| | | | | | | | | | | | | | This somewhat improves reliability of not breaking Recommends, e.g. if the Recommends gets tightened. One test case enabled by this now is the test-resolver-provider-exchange, which with a simple change to allow removal of automatically installed packages works now.
| * solver3: Promote satisfied Suggests to RecommendsJulian Andres Klode2024-05-243-23/+48
| | | | | | | | | | | | As per the test-suggests-promoted-to-recommends test. This is still a bit messy as we ignore alternative choices and only check the last one, but um seems useful?
| * test-bug-758153-versioned-provides-support: Solver 3.0 supportJulian Andres Klode2024-05-242-2/+9
| | | | | | | | | | The previous commit basically fixes this, it just requires some minor small adjustments
| * solver3: Try candidate before installed version on upgradeJulian Andres Klode2024-05-242-2/+60
| | | | | | | | | | | | | | | | | | | | This fixes --no-strict-pinning attempting to upgrade all the versions on the system. Adjust the upgrade test case accordingly: 1) no-strict-pinning pulls in systemd despite it being pinned down due to a dependenc (this was true before this fix) 2) no-strict-pinning does not pull in the upgrade-simple because nothing depends on it (this is what the test fixes)
| * test: Support the 3.0 solver in most existing test casesJulian Andres Klode2024-05-2448-115/+492
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Highlights: - test-bug-618848-always-respect-user-requests: (Do not) Support 3.0 solver A manually installed package is never removed just because we request the removal of its dependency in solver3. - test-bug-657695-resolver-breaks-on-virtuals: Support 3.0 solver For manually installed packages, solver 3.0 would require some new xserver-xorg-video-driver to Conflict+Replace+Provides the old one (once the logic is implemented), but that does seem reasonable. - test-bug-720597-build-dep-purge: Support 3.0 solver This needs a simple aptmark auto because pkga is removed by the build-dep. But further adjustments are necessary because it weirdly tested for no autoremovable packages before installing pkgc. - test-bug-960705-*: Support 3.0 solver Bit awkward to deal with; notably the protect to conflict doesn't actually work anymore and that is a feature these days.
| * test: Show statistics for parallel tests tooJulian Andres Klode2024-05-241-1/+26
| | | | | | | | | | | | | | | | This makes things a bit nicer. We also include a list of passed tests here, to use with --only to validate solver3 changes, as well as the list of skipped tests. But too lazy to implement these for the non-parallel case.
| * test: Temporarily ignore autoremovable lists for solver3Julian Andres Klode2024-05-242-2/+11
| | | | | | | | | | We do not show them yet, so let's ignore them so we can focus on getting the rest of the tests to work.
| * test: Run working tests against the 3.0 solverJulian Andres Klode2024-05-244-4/+130
| | | | | | | | | | Implement --solver, --only, -skip flags for the test suite, and run the test suite with the broken tests skipped against solver3.
| * solver3: Implement APT::Solver::RemoveManual to allow removing manual packagesJulian Andres Klode2024-05-243-2/+9
| | | | | | | | | | | | This is mostly going to be useful for the test suite for now, implement a function there to set it up so we can use it to improve test suite correctness.
| * edsp: solver3: Show some progressJulian Andres Klode2024-05-242-7/+17
|/ | | | | Ignore the Solving dependencies... line in the testing framework for compatibility with the existing test cases.
* pkgcachegen: Do not try to chmod or write to /dev/nullJulian Andres Klode2024-05-221-0/+4
| | | | | | | When -o Dir::Cache::pkgcache or -o Dir::Cache is set to /dev/null we accidentally changed its mode to 0666; which is certainly not intended. Avoid this issue by exiting the function early if the file specified is /dev/null.
* Deal better with spurious spaces in arch restrictionsDavid Kalnischkies2024-05-162-44/+93
| | | | | | | | Another instance of our parser written for sane clean input, but nowadays used also for user-provided input which can contain very many strange formatting and especially white spaces all over the place. Closes: #1071219
* Do not save new if we have already installed providersDavid Kalnischkies2024-05-162-9/+20
| | | | | | | | | | | | | | | | | | | | | | | | Companion of the previous commit that uses the same reasoning, but from the other side of the logic (as we start from reverse deps here) so that we are dropping the useless NEW from the solution. Ideally this code would not live in -private, but in -pkg, but there is not really a pre-existent good central place for this currently as a sort-of fixup for our default resolver given this is the result of resolver decision to not do something which had ripple effects that aren't reverted along with it. It is a bit unlikely that this is fixing all instances that this bug has given we have dealt with a few instances of it already as they are relatively obscure situations to clean up after and the cost of being wrong (= autoremover generating breaks) is much higher than being correct (= no pointless install – that is likely installed later anyhow after the temporary automatic hold is lifted). And by virtue of being the result of mostly temporary situations its also unlikely to be debugable in hindsight months later; so if there is another situation, its better to deal with it in a new bugreport. Closes: #839546
* Do not mark new if we have already installed providersDavid Kalnischkies2024-05-162-3/+33
| | | | | | | | | | | The test is actually documenting another bug hidden a bit by this one as we do not need to install a NEW package in this situation as the upgrade needing it was kept back, but it was protected from considering it to be autoremoveable as all providers tend to be considered protected, but by limiting us to installed providers if we have some we can drag those new packages out of hiding. Now, we "just" have to get right of the NEW package in a next step.
* Fix accidental silencing of output differences in testsDavid Kalnischkies2024-05-162-13/+39
| | | | | | | | | | Removing every line with at least three characters at the end makes comparisons for output differences rather easy to pass. The intend was to match for '\.\.\.' but given we have to adapt the strings to include autoremove remarks we can also include the string that appeared now that state information is provided (in the form of autobits). Regession-Of: 734eb9ac3f65e38ac3ba7f2d50ea206743a6f611
* Release 2.9.32.9.3Julian Andres Klode2024-05-145-6/+58
|
* Merge branch 'solver3' into 'main'Julian Andres Klode2024-05-1411-3/+1288
|\ | | | | | | | | Initial implementation of the 3.0 solver See merge request apt-team/apt!347
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2026-10-14 06:33:33 +0000