return False
else:
tag_description=p.stdout.readlines()[0].strip()
- return tag_description.decode('utf-8')
+ # with python3 this utf8 bytes should be decoded
+ if isinstance(tag_description, bytes):
+ tag_description=tag_description.decode("utf-8", "ignore")
+ return tag_description
def git_extract(from_what, tag, where, logger, environment=None):
DBG.write("git_extract", [from_what, tag, str(where)])
if not where.exists():
where.make()
+ where_git = os.path.join(str(where), ".git")
if tag == "master" or tag == "HEAD":
if src.architecture.is_windows():
cmd = "git clone %(remote)s %(where)s"
cmd = r"""
set -x
git clone %(remote)s %(where)s
+touch -d "$(git --git-dir=%(where_git)s log -1 --format=date_format)" %(where)s
"""
- cmd = cmd % {'remote': from_what, 'tag': tag, 'where': str(where)}
+#git --git-dir=%(where_git)s log -1 --format=date_format > %(where)s/last_commit_date.txt
+ cmd = cmd % {'remote': from_what, 'tag': tag, 'where': str(where), 'where_git': where_git}
else:
# NOTICE: this command only works with recent version of git
# because --work-tree does not work with an absolute path
- where_git = os.path.join(str(where), ".git")
if src.architecture.is_windows():
cmd = "rmdir %(where)s && git clone %(remote)s %(where)s && git --git-dir=%(where_git)s --work-tree=%(where)s checkout %(tag)s"
else:
rmdir %(where)s
git clone %(remote)s %(where)s && \
git --git-dir=%(where_git)s --work-tree=%(where)s checkout %(tag)s
+touch -d "$(git --git-dir=%(where_git)s log -1 --format=date_format)" %(where)s
"""
cmd = cmd % {'remote': from_what,
'tag': tag,
'where_git': where_git}
+ cmd=cmd.replace('date_format','"%ai"')
logger.logTxtFile.write("\n" + cmd + "\n")
logger.logTxtFile.flush()
stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
output, err = p.communicate()
+
rc = p.returncode
if rc==0:
msg_status=src.printcolors.printcSuccess("OK")
if check_cmd[0]=="rpm": # apt output is too messy for being used
+ # in python3 output is a byte and should be decoded
+ if isinstance(output, bytes):
+ output = output.decode("utf-8", "ignore")
msg_status+=" (" + output.replace('\n',' ') + ")\n" # remove output trailing \n
else:
msg_status=src.printcolors.printcError("KO")