pinokiod 3.19.49 → 3.19.50
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/kernel/shell.js +11 -7
- package/package.json +1 -1
package/kernel/shell.js
CHANGED
|
@@ -750,33 +750,36 @@ class Shell {
|
|
|
750
750
|
if (env_exists) {
|
|
751
751
|
conda_activation = [
|
|
752
752
|
conda_hook,
|
|
753
|
+
timeout,
|
|
753
754
|
`conda deactivate`,
|
|
754
755
|
`conda deactivate`,
|
|
755
756
|
`conda deactivate`,
|
|
756
|
-
|
|
757
|
+
timeout,
|
|
757
758
|
`conda activate ${env_path}`,
|
|
758
|
-
|
|
759
|
+
timeout,
|
|
759
760
|
]
|
|
760
761
|
} else {
|
|
761
762
|
conda_activation = [
|
|
762
763
|
conda_hook,
|
|
764
|
+
timeout,
|
|
763
765
|
`conda create -y -p ${env_path} ${conda_python} ${conda_args ? conda_args : ''}`,
|
|
764
766
|
`conda deactivate`,
|
|
765
767
|
`conda deactivate`,
|
|
766
768
|
`conda deactivate`,
|
|
767
|
-
|
|
769
|
+
timeout,
|
|
768
770
|
`conda activate ${env_path}`,
|
|
769
|
-
|
|
771
|
+
timeout,
|
|
770
772
|
]
|
|
771
773
|
}
|
|
772
774
|
} else if (conda_name) {
|
|
773
775
|
if (conda_name === "base") {
|
|
774
776
|
conda_activation = [
|
|
775
777
|
conda_hook,
|
|
778
|
+
timeout,
|
|
776
779
|
`conda deactivate`,
|
|
777
780
|
`conda deactivate`,
|
|
778
781
|
`conda deactivate`,
|
|
779
|
-
|
|
782
|
+
timeout,
|
|
780
783
|
`conda activate ${conda_name}`,
|
|
781
784
|
timeout,
|
|
782
785
|
]
|
|
@@ -787,12 +790,13 @@ class Shell {
|
|
|
787
790
|
if (env_exists) {
|
|
788
791
|
conda_activation = [
|
|
789
792
|
conda_hook,
|
|
793
|
+
timeout,
|
|
790
794
|
`conda deactivate`,
|
|
791
795
|
`conda deactivate`,
|
|
792
796
|
`conda deactivate`,
|
|
793
|
-
|
|
797
|
+
timeout,
|
|
794
798
|
`conda activate ${conda_name}`,
|
|
795
|
-
|
|
799
|
+
timeout,
|
|
796
800
|
]
|
|
797
801
|
} else {
|
|
798
802
|
conda_activation = [
|