On 12/30/21 4:08 AM, Jonathan Perkin wrote:
* On 2021-12-30 at 11:00 GMT, Benny Siegert wrote:Joerg, you do not have to use this option if you think it is not useful. But the submitter does have a use case for it, and a simple patch of less than 10 lines does not warrant this amount of discussion IMHO. I vote for adding the patch.That may be, but note that the current patch does the exact opposite of what it proposes, just in case someone is of the mind to blindly apply it...
Hi Jonathan,
You are right. Please find the fixed patch below.
Index: files/pbulk/pbulk.conf
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/pbulk/files/pbulk/pbulk.conf,v
retrieving revision 1.26
diff -u -p -r1.26 pbulk.conf
--- files/pbulk/pbulk.conf 20 Aug 2021 06:38:31 -0000 1.26
+++ files/pbulk/pbulk.conf 28 Dec 2021 11:31:13 -0000
@@ -110,9 +110,11 @@ presolve=@PREFIX@/bin/pbulk-resolve
pscan=@PREFIX@/bin/pbulk-scan
# When a package build fails, it is often necessary to have a look at
-# the working directory or the installed files. When these options are
-# set to "yes", they will be archived in the log directory.
+# the build log, working directory, or the installed files. When these
+# options are set to "yes", they will be archived in the log
+# directory.
#
+keep_wrklog=no
keep_wrkdir=no
keep_prefix=no
Index: files/pbulk/scripts/pkg-build
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/pbulk/files/pbulk/scripts/pkg-build,v
retrieving revision 1.31
diff -u -p -r1.31 pkg-build
--- files/pbulk/scripts/pkg-build 18 Dec 2016 09:36:38 -0000 1.31
+++ files/pbulk/scripts/pkg-build 28 Dec 2021 11:31:13 -0000
@@ -220,4 +220,6 @@ ${sync_package} ${pkgfile} ${pkgname} "$
${make} clean > ${bulklog}/${pkgname}/clean.log 2>&1 || true
# Cleanup build logs on success
-rm -R ${bulklog}/${pkgname}
+if [ "$keep_wrklog" = no ]; then
+ rm -R ${bulklog}/${pkgname}
+fi
Attachment:
OpenPGP_signature
Description: OpenPGP digital signature