preliminary fix for JOB resons in solver_describe_decision().
This commit is contained in:
parent
b06f772133
commit
4e8aed5e08
1
.gitignore
vendored
1
.gitignore
vendored
@ -4,3 +4,4 @@
|
||||
/libsolv-8cf7650.tar.xz
|
||||
/libsolv-d39a42b.tar.xz
|
||||
/libsolv-1617994.tar.xz
|
||||
/libsolv-1617994.tar.xz
|
||||
|
29
libsolv-job-reasons.patch
Normal file
29
libsolv-job-reasons.patch
Normal file
@ -0,0 +1,29 @@
|
||||
From 021e309f4f32642b8f53e3c8a162c4af150e269e Mon Sep 17 00:00:00 2001
|
||||
From: Ales Kozumplik <ales@redhat.com>
|
||||
Date: Tue, 10 Jul 2012 14:07:02 +0200
|
||||
Subject: [PATCH] preliminary fix for JOB resons in
|
||||
solver_describe_decision().
|
||||
|
||||
This makes the function return SOLVER_REASON_RESOLVE_JOB for some unit
|
||||
rules too. Discussion is ongoing with the libsolv upstream whether this is
|
||||
a good solution.
|
||||
---
|
||||
src/solver.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/src/solver.c b/src/solver.c
|
||||
index 68ff49f..16a0ff8 100644
|
||||
--- a/src/solver.c
|
||||
+++ b/src/solver.c
|
||||
@@ -3437,6 +3437,8 @@ solver_describe_decision(Solver *solv, Id p, Id *infop)
|
||||
{
|
||||
if (infop)
|
||||
*infop = why;
|
||||
+ if (why >= solv->jobrules && why < solv->jobrules_end)
|
||||
+ return SOLVER_REASON_RESOLVE_JOB;
|
||||
return SOLVER_REASON_UNIT_RULE;
|
||||
}
|
||||
why = -why;
|
||||
--
|
||||
1.7.10.2
|
||||
|
@ -7,13 +7,14 @@
|
||||
|
||||
Name: libsolv
|
||||
Version: 0.0.0
|
||||
Release: 12.git%{gitrev}%{?dist}
|
||||
Release: 13.git%{gitrev}%{?dist}
|
||||
License: BSD
|
||||
Url: https://github.com/openSUSE/libsolv
|
||||
# git clone https://github.com/openSUSE/libsolv.git
|
||||
# git archive %{gitrev} --prefix=libsolv/ | xz > libsolv-%{gitrev}.tar.xz
|
||||
Source: libsolv-%{gitrev}.tar.xz
|
||||
Patch0: libsolv-rubyinclude.patch
|
||||
Patch1: libsolv-job-reasons.patch
|
||||
Group: Development/Libraries
|
||||
Summary: Package dependency solver
|
||||
BuildRequires: cmake libdb-devel expat-devel rpm-devel zlib-devel
|
||||
@ -82,6 +83,7 @@ Perl bindings for sat solver.
|
||||
%prep
|
||||
%setup -q -n libsolv
|
||||
%patch0 -p1 -b .rubyinclude
|
||||
%patch1 -p1 -b .jobreasons
|
||||
|
||||
%build
|
||||
%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
|
||||
@ -141,6 +143,9 @@ rm $RPM_BUILD_ROOT/usr/bin/testsolv
|
||||
%{python_sitearch}/*
|
||||
|
||||
%changelog
|
||||
* Mon Jul 16 2012 Aleš Kozumplik <akozumpl@redhat.com> - 0.0.0-13.git1617994%{?dist}
|
||||
- preliminary fix for JOB resons in solver_describe_decision().
|
||||
|
||||
* Sun Jul 1 2012 Aleš Kozumplik <akozumpl@redhat.com> - 0.0.0-12.git1617994%{?dist}
|
||||
- Rebase to upstream 1617994.
|
||||
- Support for RPM_ADD_WITH_HDRID.
|
||||
|
Loading…
Reference in New Issue
Block a user