|
|
@@ -22,16 +22,16 @@ def copyfile(src_file, dest_file):
|
|
|
shutil.copy(src_file, dest_file)
|
|
|
|
|
|
|
|
|
-def copyfolder(src_foler, dest_folder):
|
|
|
+def copyfolder(src_folder, dest_folder):
|
|
|
if src_folder.endswith(".apk"):
|
|
|
- copyfile(src_foler, dest_folder)
|
|
|
+ copyfile(src_folder, dest_folder)
|
|
|
else:
|
|
|
- src_files = os.listdir(src_foler)
|
|
|
+ src_files = os.listdir(src_folder)
|
|
|
# 目标路径是否存在,不存在创建;
|
|
|
if not os.path.exists(dest_folder):
|
|
|
os.mkdirs(dest_folder)
|
|
|
for name in src_files:
|
|
|
- copyfile(src_foler+"\\"+name, dest_folder+"\\"+name)
|
|
|
+ copyfile(src_folder+"\\"+name, dest_folder+"\\"+name)
|
|
|
|
|
|
# 不使用重定向;
|
|
|
def cmdExecute2(cmd):
|
|
|
@@ -204,6 +204,7 @@ class localSVN:
|
|
|
def status(self, file):
|
|
|
cmd = "svn status %s"%(file)
|
|
|
msg = cmdExecute(cmd)
|
|
|
+ msg = msg.decode('gbk') #要将unicode转gbk
|
|
|
if msg.startswith("?"): # 不在控制;
|
|
|
return 0
|
|
|
elif msg.startswith("A"): # 预加入;
|
|
|
@@ -245,7 +246,7 @@ if __name__ == "__main__":
|
|
|
excel.readExcel()
|
|
|
print excel.xlsData
|
|
|
for item in excel.xlsData:
|
|
|
- if item['sqa_result'] == u"释放":
|
|
|
+ if item['sqa_result'] == u"PASS":
|
|
|
'获取apk名称'
|
|
|
apk_name = item['url'][debug_url.__len__() + 1:]
|
|
|
'更新到释放的版本'
|
