diff options
| -rw-r--r-- | lib/rpmtriggers.c | 4 | ||||
| -rw-r--r-- | tests/data/SPECS/filetriggers.spec | 2 | ||||
| -rw-r--r-- | tests/rpmscript.at | 26 |
3 files changed, 16 insertions, 16 deletions
diff --git a/lib/rpmtriggers.c b/lib/rpmtriggers.c index 23a913d35..cb2441c5a 100644 --- a/lib/rpmtriggers.c +++ b/lib/rpmtriggers.c @@ -187,7 +187,7 @@ int runPostUnTransFileTrigs(rpmts ts) headerGet(trigH, RPMTAG_INSTPREFIXES, &installPrefixes, HEADERGET_ALLOC|HEADERGET_ARGV); - nerrors += runScript(ts, NULL, trigH, installPrefixes.data, script, 0, 0); + nerrors += runScript(ts, NULL, trigH, installPrefixes.data, script, 0, -1); rpmtdFreeData(&installPrefixes); rpmScriptFree(script); headerFree(trigH); @@ -437,7 +437,7 @@ static int runHandleTriggersInPkg(rpmts ts, rpmte te, Header h, rpmScriptSetNextFileFunc(script, inputFunc, mfi); nerrors += runScript(ts, te, h, installPrefixes.data, - script, 0, 0); + script, 0, -1); rpmtdFreeData(&installPrefixes); rpmScriptFree(script); } diff --git a/tests/data/SPECS/filetriggers.spec b/tests/data/SPECS/filetriggers.spec index 3e2ee0034..35d0fb9ee 100644 --- a/tests/data/SPECS/filetriggers.spec +++ b/tests/data/SPECS/filetriggers.spec @@ -43,7 +43,7 @@ cat echo %filetriggerin -p <lua> -- /usr/bin -print("filetriggerin(/usr/bin*)<lua>: "..arg[2].." "..arg[3]) +print("filetriggerin(/usr/bin*)<lua>: "..arg[2]) a = rpm.next_file() while a do print(a) diff --git a/tests/rpmscript.at b/tests/rpmscript.at index 1a564070d..bbc198ea9 100644 --- a/tests/rpmscript.at +++ b/tests/rpmscript.at @@ -139,13 +139,13 @@ filetriggerin(/foo*)<lua>: /foo/hello-world /foo/zzzz -filetriggerin(/usr/bin*): 0 0 +filetriggerin(/usr/bin*): 0 /usr/bin/hello -filetriggerin(/usr/bin*)<lua>: 0.0 0.0 +filetriggerin(/usr/bin*)<lua>: 0.0 /usr/bin/hello -transfiletriggerin(/usr/bin*): 0 0 +transfiletriggerin(/usr/bin*): 0 /usr/bin/hello transfiletriggerin(/foo*): @@ -158,7 +158,7 @@ transfiletriggerin(/foo*): /foo/zzzz ERASE -transfiletriggerun(/usr/bin*): 0 0 +transfiletriggerun(/usr/bin*): 0 /usr/bin/hello transfiletriggerun(/foo*): @@ -188,13 +188,13 @@ filetriggerpostun(/foo*): /foo/hello-world /foo/zzzz -filetriggerun(/usr/bin*): 0 0 +filetriggerun(/usr/bin*): 0 /usr/bin/hello -filetriggerpostun(/usr/bin*): 0 0 +filetriggerpostun(/usr/bin*): 0 /usr/bin/hello -transfiletriggerpostun(/usr/bin*): 0 0 +transfiletriggerpostun(/usr/bin*): 0 transfiletriggerpostun(/foo*): @@ -230,19 +230,19 @@ runroot rpm -e parallel-trigger ], [0], [INSTALL: -%filetriggerin: 0 0 +%filetriggerin: 0 36 -%transfiletriggerin: 0 0 +%transfiletriggerin: 0 36 UPGRADE: -%transfiletriggerun: 0 0 +%transfiletriggerun: 0 36 -%filetriggerin: 0 0 +%filetriggerin: 0 36 -%transfiletriggerin: 0 0 +%transfiletriggerin: 0 36 ERASE: -%transfiletriggerun: 0 0 +%transfiletriggerun: 0 36 ], []) |