X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2Fsystem.py;h=672149d12cd50ae3986d55d9798e26b7dae6b94d;hb=c7954d2dbe563a25747441b444f55e2dcd6e9c8f;hp=6e7a788bdd41eead121c8f9cd459d56256f1d432;hpb=2d995e07e2b02f89ca0309716ca609655f56e8e8;p=tools%2Fsat.git diff --git a/src/system.py b/src/system.py index 6e7a788..672149d 100644 --- a/src/system.py +++ b/src/system.py @@ -28,6 +28,7 @@ import tarfile import debug as DBG import utilsSat as UTS +import src from . import printcolors @@ -54,6 +55,25 @@ def show_in_editor(editor, filePath, logger): logger.write(printcolors.printcError(_("Unable to edit file %s\n") % filePath), 1) +def git_describe(repo_path): + '''Use git describe --tags command to return tag description of the git repository" + :param repo_path str: The git repository to describe + ''' + git_cmd="cd %s;git describe --tags" % repo_path + p = subprocess.Popen(git_cmd, shell=True, + stdin=subprocess.PIPE, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE) + p.wait() + if p.returncode != 0: + return False + else: + tag_description=p.stdout.readlines()[0].strip() + # 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): '''Extracts sources from a git repository. @@ -69,22 +89,30 @@ 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": - cmd = r""" + if src.architecture.is_windows(): + cmd = "git clone %(remote)s %(where)s" + else: + 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") - - cmd = r""" + 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: + cmd = r""" set -x 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, @@ -92,6 +120,7 @@ git --git-dir=%(where_git)s --work-tree=%(where)s checkout %(tag)s 'where_git': where_git} + cmd=cmd.replace('date_format','"%ai"') logger.logTxtFile.write("\n" + cmd + "\n") logger.logTxtFile.flush() @@ -144,8 +173,8 @@ def git_extract_sub_dir(from_what, tag, where, sub_dir, logger, environment=None 'tmpWhere': tmpWhere, } DBG.write("git_extract_sub_dir", aDict) - - cmd = r""" + if not src.architecture.is_windows(): + cmd = r""" set -x export tmpDir=%(tmpWhere)s && \ rm -rf $tmpDir @@ -156,6 +185,19 @@ mv %(sub_dir)s %(where)s && \ git log -1 > %(where)s/README_git_log.txt && \ rm -rf $tmpDir """ % aDict + else: + cmd = r""" + +set tmpDir=%(tmpWhere)s && \ +rm -rf $tmpDir +git clone %(remote)s $tmpDir && \ +cd $tmpDir && \ +git checkout %(tag)s && \ +mv %(sub_dir)s %(where)s && \ +git log -1 > %(where)s/README_git_log.txt && \ +rm -rf $tmpDir +""" % aDict + DBG.write("cmd", cmd) for nbtry in range(0,3): # retries case of network problem @@ -288,3 +330,72 @@ def svn_extract(user, stdout=logger.logTxtFile, stderr=subprocess.STDOUT) return (res == 0) + +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 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 and linux=="RH": + cmd_is_package_installed=["rpm", "-q"] + else: + # 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): + '''Check if a package is installed + :param check_cmd list: the list of command to use system package manager + :param user str: the pkg name to check + :rtype: str + :return: a string with package name with status un message + ''' + # build command + 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) + 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 + # 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 +