On 12/03/2018 13:22, Ken Brown wrote:
On 3/8/2018 4:59 PM, Ken Brown wrote:
On 3/8/2018 10:59 AM, Ken Brown wrote:
On 3/7/2018 4:52 PM, Ken Brown wrote:
On 3/6/2018 1:47 PM, Jon Turney wrote:
On 06/03/2018 15:18, Jon Turney wrote:
So yeah, I guess putting some complexity back in accessible()
would work, or perhaps the attached? (This doesn't do the right
thing for a few packages, for reasons I'm still looking into...)
To be specific it was doing the wrong thing for those few packages
with no source
/* scan for local copies of package */
-void
+bool
packagemeta::scan (const packageversion &pkg, bool mirror_mode)
{
- /* Already have something */
+ /* empty version */
if (!pkg)
- return;
+ return true;
So, this needs to be 'return false', as the empty version is always
inaccessible, to get the same behaviour as before.
I've found another problem with local installs: If a package needs
upgrading, then the chooser will offer the upgraded version for
install, even if there's no archive available. As a result, the
current version will get uninstalled, and then setup will discover
that it doesn't have the archive to install the new version.
Thanks very much for finding this.
The problem occurs because packagedb::defaultTrust() is called after
ScanDownloadedFiles() has already done its work. solution.update()
and solution.trans2db() are called, and pkg->desired is set equal to
an inaccessible version pv (which has been previously removed from
pkg->versions).
I guess trans2db() should check that pv is in pkg->versions before
acting on an install transaction for pv. And then we also have to
make sure to ignore the erase transaction for the current version of
pkg.
Alternatively, can we just remove an inaccessible packageversion
from the libsolv pool, or at at least just tell libsolv that we
don't want to install it?
Attached is an attempt at that.
I think this is preferable, if it works correctly, as I think avoiding
solutions with these unavailable versions is better than trying to
massage the solution afterwards.
Still another alternative, and maybe the simplest, is to make sure
that the chooser never shows a version that is not in pkg->versions.
packagemeta::set_action (trusts const trust) almost does this, except
for one useless desired.accessible() call. So that should be fixed,
as well as the setting of the initial action.
Sorry for this stream of consciousness series of posts, but I'll stop
after this one. I think it's possible that restoring the previous
meaning of 'accessible()', at least for local installs, might solve
this problem.
Thanks for the patches.
From 2ec3a89555409b43b35a2d5a8f161c41c1a993d9 Mon Sep 17 00:00:00 2001
From: Jon Turney <jon.tur...@dronecode.org.uk>
Date: Wed, 14 Mar 2018 14:52:57 +0000
Subject: [PATCH setup] Remove packages not found by scan from solver
Remove (not installed) packages not found by scan from solver, as well as
from packagemeta, to avoid solutions including them from being proposed.
Signed-off-by: Jon Turney <jon.tur...@dronecode.org.uk>
---
libsolv.cc | 10 ++++++++++
libsolv.h | 2 ++
package_meta.cc | 3 +++
3 files changed, 15 insertions(+)
diff --git a/libsolv.cc b/libsolv.cc
index 674d576..fc4e5ec 100644
--- a/libsolv.cc
+++ b/libsolv.cc
@@ -304,6 +304,16 @@ SolvableVersion::compareVersions(const SolvableVersion &a,
return pool_evrcmp(pool, evra, evrb, EVRCMP_COMPARE);
}
+void
+SolvableVersion::remove() const
+{
+ if (!id)
+ return;
+
+ Solvable *solvable = pool_id2solvable(pool, id);
+ repo_free_solvable(solvable->repo, id, 0);
+}
+
// ---------------------------------------------------------------------------
// implements class SolverPool
//
diff --git a/libsolv.h b/libsolv.h
index fc68895..7bb0be2 100644
--- a/libsolv.h
+++ b/libsolv.h
@@ -88,6 +88,8 @@ class SolvableVersion
bool operator > (SolvableVersion const &) const;
bool operator >= (SolvableVersion const &) const;
+ void remove() const;
+
private:
Id id;
Pool *pool;
diff --git a/package_meta.cc b/package_meta.cc
index 8a33bcb..7f8110d 100644
--- a/package_meta.cc
+++ b/package_meta.cc
@@ -724,7 +724,10 @@ packagemeta::ScanDownloadedFiles (bool mirror_mode)
pkg.curr = packageversion ();
if (pkg.exp == *i)
pkg.exp = packageversion ();
+
+ i->remove();
pkg.versions.erase (i++);
+
/* For now, leave the source version alone */
}
else
--
2.16.2
