merged from develop

2017-08-13 17:07:36 +02:00
parent ebda6babdd
commit ed553f5cae
398 changed files with 10399 additions and 2029 deletions
@@ -6,8 +6,7 @@
 import os
 import zipfile

-import config
-import logger
+from platformcode import config, logger


 class ziptools:
@@ -32,7 +31,7 @@ class ziptools:
                    logger.info("path=%s" % path)
                    logger.info("name=%s" % name)
                    if folder_to_extract:
-                        if path != os.path.join(dir, folder):
+                        if path != os.path.join(dir, folder_to_extract):
                            break
                    else:
                        os.makedirs(path)