From a0199b0b044b5f1e58f1a8a8e9cbe67e7fd7df1a Mon Sep 17 00:00:00 2001
From: Levente Polyak <anthraxx@archlinux.org>
Date: Tue, 12 Oct 2021 19:22:30 +0200
Subject: [PATCH] fix(keyringctl): restore cwd before deleting the temporary
 working dir

This avoids potential issues with wrapped runtime like ipython or pdb
that try to invoke functions at exit and access the current working
directory, which will ultimately lead to an error in case we deleted it
before changing the current working directory.
---
 keyringctl | 49 ++++++++++++++++++++++++-------------------------
 1 file changed, 24 insertions(+), 25 deletions(-)

diff --git a/keyringctl b/keyringctl
index b6e26bf..ccd65da 100755
--- a/keyringctl
+++ b/keyringctl
@@ -1074,31 +1074,30 @@ if __name__ == '__main__':
     # temporary working directory that gets auto cleaned
     with TemporaryDirectory() as tempdir:
         working_dir = Path(tempdir)
-        chdir(working_dir)
         debug(f'Working directory: {working_dir}')
+        with cwd(working_dir):
+            if args.subcommand in ["convert", "import"]:
+                if args.target:
+                    args.target.mkdir(parents=True, exist_ok=True)
+                    target_dir = args.target
+                else:
+                    # persistent target directory
+                    target_dir = Path(mkdtemp()).absolute()
 
-        if args.subcommand in ["convert", "import"]:
-            if args.target:
-                args.target.mkdir(parents=True, exist_ok=True)
-                target_dir = args.target
-            else:
-                # persistent target directory
-                target_dir = Path(mkdtemp()).absolute()
+            if 'convert' == args.subcommand:
+                print(convert(working_dir, args.source, target_dir))
+            elif 'import' == args.subcommand:
+                keyring_import(working_dir, args.source, target_dir)
+            elif 'export' == args.subcommand:
+                export_keyring(
+                    working_dir=working_dir,
+                    main=args.main,
+                    sources=args.source,
+                    output=args.output,
+                    force=args.force,
+                    pacman_integration=args.pacman_integration,
+                )
 
-        if 'convert' == args.subcommand:
-            print(convert(working_dir, args.source, target_dir))
-        elif 'import' == args.subcommand:
-            keyring_import(working_dir, args.source, target_dir)
-        elif 'export' == args.subcommand:
-            export_keyring(
-                working_dir=working_dir,
-                main=args.main,
-                sources=args.source,
-                output=args.output,
-                force=args.force,
-                pacman_integration=args.pacman_integration,
-            )
-
-        if args.wait:
-            print('Press [ENTER] to continue')
-            input()
+            if args.wait:
+                print('Press [ENTER] to continue')
+                input()