| 1 |
From 237387f1423ed3a1db7ea8f98edf5ea1da5c6ec8 Mon Sep 17 00:00:00 2001 |
| 2 |
From: unknown author <cooker@mandrivalinux.org> |
| 3 |
Date: Mon, 5 Jan 2009 13:29:57 +0000 |
| 4 |
Subject: [PATCH 02/35] non pre scripts dont fail |
| 5 |
|
| 6 |
--- |
| 7 |
lib/psm.c | 23 ++++++++--------------- |
| 8 |
1 files changed, 8 insertions(+), 15 deletions(-) |
| 9 |
|
| 10 |
diff --git a/lib/psm.c b/lib/psm.c |
| 11 |
index 9070c6d..890b223 100644 |
| 12 |
--- a/lib/psm.c |
| 13 |
+++ b/lib/psm.c |
| 14 |
@@ -1398,16 +1398,14 @@ assert(psm->mi == NULL); |
| 15 |
|
| 16 |
if (!(rpmtsFlags(ts) & RPMTRANS_FLAG_NOTRIGGERUN)) { |
| 17 |
/* Run triggers in this package other package(s) set off. */ |
| 18 |
- rc = rpmpsmNext(psm, PSM_IMMED_TRIGGERS); |
| 19 |
- if (rc) break; |
| 20 |
+ rpmpsmNext(psm, PSM_IMMED_TRIGGERS); |
| 21 |
|
| 22 |
/* Run triggers in other package(s) this package sets off. */ |
| 23 |
- rc = rpmpsmNext(psm, PSM_TRIGGERS); |
| 24 |
- if (rc) break; |
| 25 |
+ rpmpsmNext(psm, PSM_TRIGGERS); |
| 26 |
} |
| 27 |
|
| 28 |
if (!(rpmtsFlags(ts) & RPMTRANS_FLAG_NOPREUN)) |
| 29 |
- rc = rpmpsmNext(psm, PSM_SCRIPT); |
| 30 |
+ rpmpsmNext(psm, PSM_SCRIPT); |
| 31 |
} |
| 32 |
break; |
| 33 |
case PSM_PROCESS: |
| 34 |
@@ -1542,17 +1540,14 @@ assert(psm->mi == NULL); |
| 35 |
psm->countCorrection = 0; |
| 36 |
|
| 37 |
if (!(rpmtsFlags(ts) & RPMTRANS_FLAG_NOPOST)) { |
| 38 |
- rc = rpmpsmNext(psm, PSM_SCRIPT); |
| 39 |
- if (rc) break; |
| 40 |
+ rpmpsmNext(psm, PSM_SCRIPT); |
| 41 |
} |
| 42 |
if (!(rpmtsFlags(ts) & RPMTRANS_FLAG_NOTRIGGERIN)) { |
| 43 |
/* Run triggers in other package(s) this package sets off. */ |
| 44 |
- rc = rpmpsmNext(psm, PSM_TRIGGERS); |
| 45 |
- if (rc) break; |
| 46 |
+ rpmpsmNext(psm, PSM_TRIGGERS); |
| 47 |
|
| 48 |
/* Run triggers in this package other package(s) set off. */ |
| 49 |
- rc = rpmpsmNext(psm, PSM_IMMED_TRIGGERS); |
| 50 |
- if (rc) break; |
| 51 |
+ rpmpsmNext(psm, PSM_IMMED_TRIGGERS); |
| 52 |
} |
| 53 |
|
| 54 |
if (!(rpmtsFlags(ts) & RPMTRANS_FLAG_APPLYONLY)) |
| 55 |
@@ -1567,14 +1562,12 @@ assert(psm->mi == NULL); |
| 56 |
psm->countCorrection = -1; |
| 57 |
|
| 58 |
if (!(rpmtsFlags(ts) & RPMTRANS_FLAG_NOPOSTUN)) { |
| 59 |
- rc = rpmpsmNext(psm, PSM_SCRIPT); |
| 60 |
- if (rc) break; |
| 61 |
+ rpmpsmNext(psm, PSM_SCRIPT); |
| 62 |
} |
| 63 |
|
| 64 |
if (!(rpmtsFlags(ts) & RPMTRANS_FLAG_NOTRIGGERPOSTUN)) { |
| 65 |
/* Run triggers in other package(s) this package sets off. */ |
| 66 |
- rc = rpmpsmNext(psm, PSM_TRIGGERS); |
| 67 |
- if (rc) break; |
| 68 |
+ rpmpsmNext(psm, PSM_TRIGGERS); |
| 69 |
} |
| 70 |
|
| 71 |
if (!(rpmtsFlags(ts) & RPMTRANS_FLAG_APPLYONLY)) |
| 72 |
-- |
| 73 |
1.6.1.3 |
| 74 |
|
Parent Directory
| 
Revision Log