Attachment 6129 Details for Bug 15350 – (check) fix reporting problems

[patch] (check) fix reporting problems

0002-check-fix-reporting-problems.patch (text/plain), 1.49 KB, created by Thierry Vignaud on 2015-03-24 10:30:00 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Thierry Vignaud

Created: 2015-03-24 10:30:00 CET

Size: 1.49 KB

patch

obsolete

>From 39cfabce1a9e870a99140957e4941c4e5c7c11b3 Mon Sep 17 00:00:00 2001
>From: Thierry Vignaud <thierry.vignaud@gmail.com>
>Date: Tue, 24 Mar 2015 05:08:14 -0400
>Subject: [PATCH 2/2] (check) fix reporting problems
>
>for at least 12 years, since swiching rpm to 4.2
>(see commit 60031191b7012fdfe8e1af6bd43ff9b36b0c5825)
>$trans->check() failed to actually report issues
>
>rationale: rpmtsCheck() only actually return !0 if it fails to open
>rpmdb...
>
>in order to check if any problem was found by rpmtsCheck(), one must call
>retrieving the problem set with rpmtsProblems()
>
>rpmtsCheck() success only means that the resolution was successfully
>attempted for all packages in the set, which isn't that usefull...
>
>this might help mga#15350...
>---
> URPM.xs | 8 +-------
> 1 file changed, 1 insertion(+), 7 deletions(-)
>
>diff --git a/URPM.xs b/URPM.xs
>index 5e2eec3..efa4035 100644
>--- a/URPM.xs
>+++ b/URPM.xs
>@@ -2595,12 +2595,7 @@ Trans_check(trans, ...)
>     if (len == 17 && !memcmp(s, "translate_message", 17))
>       translate_message = SvIV(ST(i+1));
>   }
>-  if (rpmtsCheck(trans->ts)) {
>-    if (gimme == G_SCALAR)
>-      mXPUSHs(newSViv(0));
>-    else if (gimme == G_ARRAY)
>-      mXPUSHs(newSVpvs("error while checking dependencies"));
>-  } else {
>+  rpmtsCheck(trans->ts);
>     rpmps ps = rpmtsProblems(trans->ts);
>     if (rpmpsNumProblems(ps) > 0) {
>       if (gimme == G_SCALAR)
>@@ -2615,7 +2610,6 @@ Trans_check(trans, ...)
>       mXPUSHs(newSViv(1));
>     
>     rpmpsFree(ps);
>-  }
> 
> void
> Trans_order(trans, ...)
>-- 
>2.3.2
>

From 39cfabce1a9e870a99140957e4941c4e5c7c11b3 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Tue, 24 Mar 2015 05:08:14 -0400
Subject: [PATCH 2/2] (check) fix reporting problems

for at least 12 years, since swiching rpm to 4.2
(see commit 60031191b7012fdfe8e1af6bd43ff9b36b0c5825)
$trans->check() failed to actually report issues

rationale: rpmtsCheck() only actually return !0 if it fails to open
rpmdb...

in order to check if any problem was found by rpmtsCheck(), one must call
retrieving the problem set with rpmtsProblems()

rpmtsCheck() success only means that the resolution was successfully
attempted for all packages in the set, which isn't that usefull...

this might help mga#15350...
---
 URPM.xs | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/URPM.xs b/URPM.xs
index 5e2eec3..efa4035 100644
--- a/URPM.xs
+++ b/URPM.xs
@@ -2595,12 +2595,7 @@ Trans_check(trans, ...)
     if (len == 17 && !memcmp(s, "translate_message", 17))
       translate_message = SvIV(ST(i+1));
   }
-  if (rpmtsCheck(trans->ts)) {
-    if (gimme == G_SCALAR)
-      mXPUSHs(newSViv(0));
-    else if (gimme == G_ARRAY)
-      mXPUSHs(newSVpvs("error while checking dependencies"));
-  } else {
+  rpmtsCheck(trans->ts);
     rpmps ps = rpmtsProblems(trans->ts);
     if (rpmpsNumProblems(ps) > 0) {
       if (gimme == G_SCALAR)
@@ -2615,7 +2610,6 @@ Trans_check(trans, ...)
       mXPUSHs(newSViv(1));
     
     rpmpsFree(ps);
-  }
 
 void
 Trans_order(trans, ...)
-- 
2.3.2

Actions: View | Diff

Attachments on bug 15350: 5943 | 6020 | 6030 | 6056 | 6072 | 6073 | 6074 | 6129 | 6130 | 6158 | 6174 | 6212 | 6213 | 6239 | 6240 | 6241 | 6242