Control: tags -1 patch

FYI I have found that skipping the call to
VirtSubproc.downtmp_remove() in autopkgtest-virt-null does indeed
solve the problem I was having.

Patch to add an option to do that, attached.  I'm happy to make
further changes if desired.

(FTR I notice that many contributors to the git history add
Signed-off-by lines.  I assume that this must refer to the Developer
Certificate of Origin but no copy of the DCO is in-tree.  FTOAD
please consider me to have signed off my patch below in accordance
with DCO v1.1)

Thanks,
Ian.

>From 73caa0e88ee7dcbff31cd884fcd717e8648159fb Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijack...@chiark.greenend.org.uk>
Date: Sat, 11 Jan 2025 17:32:04 +0000
Subject: [PATCH] autopkgtest-virt-null: New --retain-tmp option

Closes: #1092771
---
 virt/autopkgtest-virt-null | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/virt/autopkgtest-virt-null b/virt/autopkgtest-virt-null
index 6f8747d..4b78e46 100755
--- a/virt/autopkgtest-virt-null
+++ b/virt/autopkgtest-virt-null
@@ -43,9 +43,13 @@ if os.getuid() == 0:
 
 
 def parse_args():
+    global args
+
     parser = argparse.ArgumentParser()
     parser.add_argument('-d', '--debug', action='store_true',
                         help='Enable debugging output')
+    parser.add_argument('--retain-tmp', action='store_true',
+        help='Retain temporary subdir (you should set TMPDIR)')
     args = parser.parse_args()
     if args.debug:
         adtlog.verbosity = 2
@@ -66,7 +70,8 @@ def hook_downtmp(path):
 def hook_cleanup():
     global capabilities
 
-    VirtSubproc.downtmp_remove()
+    if not args.retain_tmp:
+        VirtSubproc.downtmp_remove()
     capabilities = [c for c in capabilities if not 
c.startswith('downtmp-host')]
 
 
-- 
2.45.2

-- 
Ian Jackson <ijack...@chiark.greenend.org.uk>   These opinions are my own.  

Pronouns: they/he.  If I emailed you from @fyvzl.net or @evade.org.uk,
that is a private address which bypasses my fierce spamfilter.

Reply via email to