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):
+def git_extract(from_what, tag, git_options, where, logger, environment=None):
'''Extracts sources from a git repository.
:param from_what str: The remote git repository.
:param tag str: The tag.
+ :param git_options str: git options
:param where str: The path where to extract.
:param logger Logger: The logger instance to use.
:param environment src.environment.Environ: The environment to source when extracting.
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 = "git clone %(git_options)s %(remote)s %(where)s"
else:
cmd = r"""
set -x
-git clone %(remote)s %(where)s
+git clone %(git_options)s %(remote)s %(where)s
+res=$?
+if [ $res -eq 0 ]; then touch -d "$(git --git-dir=%(where_git)s log -1 --format=date_format)" %(where)s;fi
+exit $res
"""
- cmd = cmd % {'remote': from_what, 'tag': tag, 'where': str(where)}
+ cmd = cmd % {'git_options': git_options, '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"
+ cmd = "rm -rf %(where)s && git clone %(git_options)s %(remote)s %(where)s && git --git-dir=%(where_git)s --work-tree=%(where)s checkout %(tag)s"
else:
+# for sat compile --update : changes the date of directory, only for branches, not tag
cmd = r"""
set -x
-rmdir %(where)s
-git clone %(remote)s %(where)s && \
+rm -rf %(where)s
+git clone %(git_options)s %(remote)s %(where)s && \
git --git-dir=%(where_git)s --work-tree=%(where)s checkout %(tag)s
+res=$?
+git --git-dir=%(where_git)s status|grep HEAD
+if [ $res -eq 0 -a $? -ne 0 ]; then touch -d "$(git --git-dir=%(where_git)s log -1 --format=date_format)" %(where)s;fi
+exit $res
"""
- cmd = cmd % {'remote': from_what,
+ cmd = cmd % {'git_options': git_options,
+ 'remote': from_what,
'tag': tag,
'where': str(where),
'where_git': where_git}
+ cmd=cmd.replace('date_format','"%ai"')
logger.logTxtFile.write("\n" + cmd + "\n")
logger.logTxtFile.flush()
DBG.write("cmd", cmd)
-
# git commands may fail sometimes for various raisons
# (big module, network troubles, tuleap maintenance)
# therefore we give several tries
return rc.isOk()
-def git_extract_sub_dir(from_what, tag, where, sub_dir, logger, environment=None):
+def git_extract_sub_dir(from_what, tag, git_options, where, sub_dir, logger, environment=None):
'''Extracts sources from a subtree sub_dir of a git repository.
:param from_what str: The remote git repository.
:param tag str: The tag.
+ :param git_options str: git options
:param where str: The path where to extract.
:param sub_dir str: The relative path of subtree to extract.
:param logger Logger: The logger instance to use.
if os.path.isdir(strWhere):
logger.error("do not override existing directory: %s" % strWhere)
return False
- aDict = {'remote': from_what,
+ aDict = {'git_options': git_options,
+ 'remote': from_what,
'tag': tag,
'sub_dir': sub_dir,
'where': strWhere,
set -x
export tmpDir=%(tmpWhere)s && \
rm -rf $tmpDir
-git clone %(remote)s $tmpDir && \
+git clone %(git_options)s %(remote)s $tmpDir && \
cd $tmpDir && \
git checkout %(tag)s && \
mv %(sub_dir)s %(where)s && \
set tmpDir=%(tmpWhere)s && \
rm -rf $tmpDir
-git clone %(remote)s $tmpDir && \
+git clone %(git_options)s %(remote)s $tmpDir && \
cd $tmpDir && \
git checkout %(tag)s && \
mv %(sub_dir)s %(where)s && \
stderr=subprocess.STDOUT)
return (res == 0)
-def get_pkg_check_cmd():
+def get_pkg_check_cmd(dist_name):
'''Build the command to use for checking if a linux package is installed or not.'''
+
+ if dist_name in ["CO","FD","MG","MD","CO","OS"]: # linux using rpm
+ linux="RH"
+ manager_msg_err="Error : command failed because sat was not able to find apt command"
+ else:
+ linux="DB"
+ manager_msg_err="Error : command failed because sat was not able to find rpm command"
+
# 1- search for an installed package manager (rpm on rh, apt on db)
cmd_which_rpm=["which", "rpm"]
cmd_which_apt=["which", "apt"]
with open(os.devnull, 'w') as devnull:
# 1) we search for apt (debian based systems)
completed=subprocess.call(cmd_which_apt,stdout=devnull, stderr=subprocess.STDOUT)
- if completed==0:
+ if completed==0 and linux=="DB":
cmd_is_package_installed=["apt", "list", "--installed"]
else:
# 2) if apt not found search for rpm (redhat)
completed=subprocess.call(cmd_which_rpm,stdout=devnull, stderr=subprocess.STDOUT) # only 3.8! ,capture_output=True)
- if completed==0:
+ if completed==0 and linux=="RH":
cmd_is_package_installed=["rpm", "-q"]
else:
- # no package manager was found
- raise src.SatException("Error : command failed because sat was not able to find apt or rpm")
+ # no package manager was found corresponding to dist_name
+ raise src.SatException(manager_msg_err)
return cmd_is_package_installed
def check_system_pkg(check_cmd,pkg):
:return: a string with package name with status un message
'''
# build command
+ FNULL = open(os.devnull, 'w')
cmd_is_package_installed=[]
for cmd in check_cmd:
cmd_is_package_installed.append(cmd)
cmd_is_package_installed.append(pkg)
+
+
if check_cmd[0]=="apt":
# special treatment for apt
- # (some debian packages have version numbers in their name, and also
- # apt do not return status)
+ # apt output is too messy for being used
+ # some debian packages have version numbers in their name, we need to add a *
+ # also apt do not return status, we need to use grep
+ # and apt output is too messy for being used
cmd_is_package_installed[-1]+="*" # we don't specify in pyconf the exact name because of version numbers
- cmd_is_package_installed.append('|')
- cmd_is_package_installed.append('grep') # add a grep to get an exit status
- cmd_is_package_installed.append(cmd)
-
- p=subprocess.Popen(cmd_is_package_installed,
- 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
- msg_status+=" (" + output.replace('\n',' ') + ")\n" # remove output trailing \n
+ p=subprocess.Popen(cmd_is_package_installed,
+ stdout=subprocess.PIPE,
+ stderr=FNULL)
+ try:
+ output = subprocess.check_output(['grep', pkg], stdin=p.stdout)
+ msg_status=src.printcolors.printcSuccess("OK")
+ except:
+ msg_status=src.printcolors.printcError("KO")
+ msg_status+=" (package is not installed!)\n"
else:
- msg_status=src.printcolors.printcError("KO")
- msg_status+=" (package is not installed!)\n"
+ p=subprocess.Popen(cmd_is_package_installed,
+ stdout=subprocess.PIPE,
+ stderr=FNULL)
+ output, err = p.communicate()
+ rc = p.returncode
+ if rc==0:
+ msg_status=src.printcolors.printcSuccess("OK")
+ # 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")
+ msg_status+=" (package is not installed!)\n"
return msg_status
-
