Merge pull request #1 from SummerGGift/chinese_style

Chinese style

Author: SummerGift

archive.py

@@ -30,20 +30,17 @@
 
 
 def unpack(archive_fn, path, pkg, pkgs_name_in_json):
-
+    pkg_ver = pkg['ver']
     flag = True
-    
-    #print(pkg)
-    
+
     if ".tar.bz2" in archive_fn:
         arch = tarfile.open(archive_fn, "r:bz2")
         for tarinfo in arch:
             arch.extract(tarinfo, path)
             a = tarinfo.name
             if not os.path.isdir(os.path.join(path, a)):
                 right_path = a.replace('/', '\\')
-                a = os.path.join(os.path.split(right_path)[
-                                 0], os.path.split(right_path)[1])
+                a = os.path.join(os.path.split(right_path)[0], os.path.split(right_path)[1])
                 pkgsdb.savetodb(a, archive_fn)
         arch.close()
 
@@ -54,8 +51,7 @@ def unpack(archive_fn, path, pkg, pkgs_name_in_json):
             a = tarinfo.name
             if not os.path.isdir(os.path.join(path, a)):
                 right_path = a.replace('/', '\\')
-                a = os.path.join(os.path.split(right_path)[
-                                 0], os.path.split(right_path)[1])
+                a = os.path.join(os.path.split(right_path)[0], os.path.split(right_path)[1])
                 pkgsdb.savetodb(a, archive_fn)
         arch.close()
 
@@ -68,22 +64,17 @@ def unpack(archive_fn, path, pkg, pkgs_name_in_json):
                 # Gets the folder name and change_dirname only once
                 if flag:
                     dir_name = os.path.split(right_path)[0]
-                    change_dirname = pkgs_name_in_json + '-' + pkg['ver']
+                    change_dirname = pkgs_name_in_json + '-' + pkg_ver
                     flag = False
 
-                right_name_to_db = right_path.replace(
-                    dir_name, change_dirname, 1)
-                #print(right_name_to_db)
+                right_name_to_db = right_path.replace(dir_name, change_dirname, 1)
                 pkgsdb.savetodb(right_name_to_db, archive_fn, right_path)
         arch.close()
 
-    #Change the folder name
-    
-    change_dirname = pkgs_name_in_json + '-' + pkg['ver']
-    #print(os.path.join(path, dir_name))
-    #print(os.path.join(path, change_dirname))
-    #print(pkgs_name_in_json)
+    # Change the folder name
 
+    change_dirname = pkgs_name_in_json + '-' + pkg_ver
+
     if os.path.isdir(os.path.join(path, change_dirname)):
         cmd = 'rd /s /q ' + os.path.join(path, change_dirname)
         os.system(cmd)
@@ -96,28 +87,32 @@ def packtest(path):
     if ".zip" in path:
         try:
             if zipfile.is_zipfile(path):
-            # test zip again to make sure it's a right zip file.
+                # Test zip again to make sure it's a right zip file.
                 arch = zipfile.ZipFile(path, "r")
                 if arch.testzip():
                     ret = False
-                arch.close()                    
+                arch.close()
+            else:
+                ret = False
+                print('package check error. \n')
         except Exception, e:
-            print('e.message:%s\t'%e.message)
-            arch.close()
+            print('packtest e.message:%s\t' % e.message)
+#             arch.close()
+            print("The archive package is broken. \n")
             ret = False
-                
+
     if ".tar.bz2" in path:
         try:
             if not tarfile.is_tarfile(path):
-                ret = False                    
+                ret = False
         except Exception, e:
             ret = False
 
     if ".tar.gz" in path:
         try:
             if not tarfile.is_tarfile(path):
-                ret = False                    
+                ret = False
         except Exception, e:
             ret = False
-                    
+
     return ret

cmds/cmd_menuconfig.py

@@ -185,6 +185,8 @@ def cmd(args):
     else:
         mtime = -1
 
+    os.system('chcp 437  > nul')
+
     if args.menuconfig_fn:
         print 'use', args.menuconfig_fn
         import shutil
@@ -194,6 +196,7 @@ def cmd(args):
     elif args.menuconfig_silent:
         if float(os_version) >= 6.2:
             os.system('kconfig-mconf Kconfig -n')
+            mk_rtconfig(fn)
         else:
             if os.path.isfile(kconfig_win7_path):
                 os.system('kconfig-mconf_win7 Kconfig -n')
@@ -232,6 +235,8 @@ def cmd(args):
     if mtime != mtime2:
         mk_rtconfig(fn)
 
+    os.system('chcp 65001 > nul')
+    
     if platform.system() == "Windows":
         env_kconfig_path = os.path.join(env_root, 'tools\scripts\cmds')
         fn = os.path.join(env_kconfig_path, '.config')