Fix logger setting is changed by PyInstaller

SahalaProject · May 8, 2023 · fd64297 · fd64297
1 parent c09704e
commit fd64297
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/src/cli/__main__.py b/src/cli/__main__.py
@@ -31,7 +31,6 @@
 from .shell import PyarmorShell
 from .plugin import Plugin
 from .generate import Builder
-from .repack import Repacker
 
 
 def _cmd_gen_key(builder, options):
@@ -222,10 +221,14 @@ def cmd_gen(ctx, args):
         _cmd_gen_key(builder, options)
     elif args.inputs[0].lower() in ('runtime', 'run', 'r'):
         _cmd_gen_runtime(builder, options)
-    else:
-        packer = Repacker(args.pack, ctx.repack_path) if args.pack else None
+    elif args.pack:
+        from .repack import Repacker
+        packer = Repacker(args.pack, ctx.repack_path)
         builder.process(options, packer=packer)
         Plugin.post_build(ctx, pack=args.pack)
+    else:
+        builder.process(options)
+        Plugin.post_build(ctx)
 
 
 def cmd_cfg(ctx, args):

diff --git a/src/cli/repack.py b/src/cli/repack.py
@@ -367,12 +367,3 @@ def repack(self, obfpath, rtname, entry=None):
             shutil.copy2(rtbinary, dest)
 
         repack_executable(executable, buildpath, obfpath, rtentry)
-
-
-if __name__ == '__main__':
-    logging.basicConfig(
-        level=logging.DEBUG,
-        format='%(message)s',
-    )
-    dest = '.pyarmor/pack'
-    os.makedirs(dest, exist_ok=True)