Adding upstream version 1.22.7.upstream/1.22.7

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 5 insertions, 6 deletions

diff --git a/src/main/trigproc.c b/src/main/trigproc.c
index 125eb02..dc8dc83 100644
--- a/src/main/trigproc.c
+++ b/src/main/trigproc.c
@@ -434,17 +434,17 @@ trigproc(struct pkginfo *pkg, enum trigproc_type type)
 			}
 
 			sincenothing = 0;
-			varbuf_end_str(&depwhynot);
 			notice(_("dependency problems prevent processing "
 			         "triggers for %s:\n%s"),
-			       pkg_name(pkg, pnaw_nonambig), depwhynot.buf);
+			       pkg_name(pkg, pnaw_nonambig),
+			       varbuf_str(&depwhynot));
 			varbuf_destroy(&depwhynot);
 			ohshit(_("dependency problems - leaving triggers unprocessed"));
 		} else if (depwhynot.used) {
-			varbuf_end_str(&depwhynot);
 			notice(_("%s: dependency problems, but processing "
 			         "triggers anyway as you requested:\n%s"),
-			       pkg_name(pkg, pnaw_nonambig), depwhynot.buf);
+			       pkg_name(pkg, pnaw_nonambig),
+			       varbuf_str(&depwhynot));
 			varbuf_destroy(&depwhynot);
 		}
 
@@ -462,7 +462,6 @@ trigproc(struct pkginfo *pkg, enum trigproc_type type)
 			varbuf_add_char(&namesarg, ' ');
 			varbuf_add_str(&namesarg, tp->name);
 		}
-		varbuf_end_str(&namesarg);
 
 		/* Setting the status to half-configured
 		 * causes modstatdb_note to clear pending triggers. */
@@ -472,7 +471,7 @@ trigproc(struct pkginfo *pkg, enum trigproc_type type)
 		if (!f_noact) {
 			sincenothing = 0;
 			maintscript_postinst(pkg, "triggered",
-			                     namesarg.buf + 1, NULL);
+			                     varbuf_str(&namesarg) + 1, NULL);
 		}
 
 		post_postinst_tasks(pkg, PKG_STAT_INSTALLED);