VirtualEnv/VirtualenvManager.py

branch
conda
changeset 6676
536ad4fa35aa
parent 6672
2af01e538c57
child 6677
6299d69a218a
diff -r 2af01e538c57 -r 536ad4fa35aa VirtualEnv/VirtualenvManager.py
--- a/VirtualEnv/VirtualenvManager.py	Sat Jan 26 19:42:53 2019 +0100
+++ b/VirtualEnv/VirtualenvManager.py	Sun Jan 27 12:39:53 2019 +0100
@@ -21,6 +21,7 @@
 from E5Gui import E5MessageBox
 
 import Preferences
+import Utilities
 
 
 class VirtualenvManager(QObject):
@@ -157,9 +158,6 @@
                 # now do the call
                 from .VirtualenvExecDialog import VirtualenvExecDialog
                 dia = VirtualenvExecDialog(resultDict, self)
-##                dia = VirtualenvExecDialog(pyvenv, targetDir, name, openTarget,
-##                                           createLog, createScript, interpreter,
-##                                           self)
             dia.show()
             dia.start(resultDict["arguments"])
             dia.exec_()
@@ -203,7 +201,9 @@
             dlg = VirtualenvInterpreterSelectionDialog(venvName, venvDirectory)
             if dlg.exec_() == QDialog.Accepted:
                 venvInterpreter, venvVariant = dlg.getData()
-                isGlobal = True
+                if not Utilities.startswithPath(venvInterpreter,
+                                                venvDirectory):
+                    isGlobal = True
         
         if venvInterpreter:
             self.__virtualEnvironments[venvName] = {

eric ide

mercurial