Merge from default production
authorBen Hearsum <bhearsum@mozilla.com>
Wed, 23 May 2018 14:13:39 -0400
branchproduction
changeset 6910 cb7e2f8aa95b94da3702c04271b96c2d1242ecbe
parent 6908 9b341df995cf43e0426dd20973c7a15f70b52065 (current diff)
parent 6909 c7d40f1d8beee6a73c9f1331538c0e952f25142a (diff)
child 6912 d906112357313ff1e7e19d8e8cd35b94afa216f5
push id2778
push userasasaki@mozilla.com
push dateTue, 29 May 2018 19:35:39 +0000
Merge from default
--- a/modules/python/manifests/virtualenv.pp
+++ b/modules/python/manifests/virtualenv.pp
@@ -92,21 +92,27 @@ define python::virtualenv($python, $ensu
                 "${virtualenv}||pip==${python::virtualenv::settings::pip_version}":
                     user => $ve_user;
             }
             exec {
                 "virtualenv ${virtualenv}":
                     user      => $ve_user,
                     command   => $ve_cmd,
                     logoutput => on_failure,
-                    require   => [
-                        File[$virtualenv],
-                        Class['python::virtualenv::prerequisites'],
-                        Exec["rebuild ${virtualenv}"],
-                    ],
+                    require   => $::operatingsystem ? {
+                        windows => [
+                            File[$virtualenv],
+                            Class['python::virtualenv::prerequisites'],
+                        ],
+                        default => [
+                            File[$virtualenv],
+                            Class['python::virtualenv::prerequisites'],
+                            Exec["rebuild ${virtualenv}"],
+                        ],
+                    }
                     creates   => $::operatingsystem ? {
                         windows => "${virtualenv}/Scripts/pip.exe",
                         default => "${virtualenv}/bin/pip"
                     },
                     cwd       => $virtualenv;
             }
 
             if ($packages != null) {
--- a/modules/python27/manifests/virtualenv.pp
+++ b/modules/python27/manifests/virtualenv.pp
@@ -87,21 +87,27 @@ define python27::virtualenv($python, $en
                         group  => $ve_group;
                 }
             }
             exec {
                 "virtualenv ${virtualenv}":
                     user      => $ve_user,
                     command   => $ve_cmd,
                     logoutput => on_failure,
-                    require   => [
-                        File[$virtualenv],
-                        Class['python27::virtualenv::prerequisites'],
-                        Exec["rebuild ${virtualenv}"],
-                    ],
+                    require   => $::operatingsystem ? {
+                        windows => [
+                            File[$virtualenv],
+                            Class['python27::virtualenv::prerequisites'],
+                        ],
+                        default => [
+                            File[$virtualenv],
+                            Class['python27::virtualenv::prerequisites'],
+                            Exec["rebuild ${virtualenv}"],
+                        ],
+                    },
                     creates   => $::operatingsystem ? {
                         windows => "${virtualenv}/Scripts/pip.exe",
                         default => "${virtualenv}/bin/pip"
                     },
                     cwd       => $virtualenv;
             }
 
             if ($packages != null) {