equal
deleted
inserted
replaced
163 if p is None: |
163 if p is None: |
164 return p |
164 return p |
165 return p.decode('utf-8') |
165 return p.decode('utf-8') |
166 |
166 |
167 |
167 |
|
168 original_env = os.environ.copy() |
168 osenvironb = getattr(os, 'environb', None) |
169 osenvironb = getattr(os, 'environb', None) |
169 if osenvironb is None: |
170 if osenvironb is None: |
170 # Windows lacks os.environb, for instance. A proxy over the real thing |
171 # Windows lacks os.environb, for instance. A proxy over the real thing |
171 # instead of a copy allows the environment to be updated via bytes on |
172 # instead of a copy allows the environment to be updated via bytes on |
172 # all platforms. |
173 # all platforms. |
3761 |
3762 |
3762 makedirs(self._pythondir) |
3763 makedirs(self._pythondir) |
3763 makedirs(self._bindir) |
3764 makedirs(self._bindir) |
3764 |
3765 |
3765 vlog("# Running", cmd.decode("utf-8")) |
3766 vlog("# Running", cmd.decode("utf-8")) |
3766 if subprocess.call(_bytes2sys(cmd), shell=True) == 0: |
3767 if subprocess.call(_bytes2sys(cmd), shell=True, env=original_env) == 0: |
3767 if not self.options.verbose: |
3768 if not self.options.verbose: |
3768 try: |
3769 try: |
3769 os.remove(installerrs) |
3770 os.remove(installerrs) |
3770 except FileNotFoundError: |
3771 except FileNotFoundError: |
3771 pass |
3772 pass |