relax constraint about openssl for windows - Python embeds already ssl

diff --git a/commands/compile.py b/commands/compile.py
index 12cfbe6acf8e26d137571e30fc7939051684bed9..d084b2df8fbaf624a90168bbe00b407660d12dba 100644 (file)
--- a/commands/compile.py
+++ b/commands/compile.py
@@ -502,7 +502,7 @@ def compile_product_pip(sat,
     :rtype: int
     '''
     # pip needs openssl-dev. If openssl is declared in the application, we check it!
-    if "openssl" in config.APPLICATION.products:
+    if "openssl" in config.APPLICATION.products and not src.architecture.is_windows():
         openssl_cfg = src.product.get_product_config(config, "openssl")
         if not src.product.check_installation(config, openssl_cfg):
             raise src.SatException(_("please install system openssl development package, it is required for products managed by pip."))

diff --git a/src/system.py b/src/system.py
index cc500d0f5862ff3886a20e65309c9ef57687125a..7b8d1492bbbb3082f4c9b0eb04b5c7ef74401c0a 100644 (file)
--- a/src/system.py
+++ b/src/system.py
@@ -152,7 +152,7 @@ exit $res
     # NOTICE: this command only works with recent version of git
     #         because --work-tree does not work with an absolute path
     if src.architecture.is_windows():
-      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"
+      cmd = "rmdir /S /Q %(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"""
@@ -244,13 +244,13 @@ rm -rf $tmpDir
     cmd = r"""
 
 set tmpDir=%(tmpWhere)s && \
-rm -rf $tmpDir
-git clone %(git_options)s %(remote)s $tmpDir && \
-cd $tmpDir && \
+rmdir /S /Q %tmpDir%
+git clone %(git_options)s %(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
+git log -1 > %(where)s\\README_git_log.txt && \
+rmdir /S /Q %tmpDir%
 """ % aDict
 
   DBG.write("cmd", cmd)