misc bugs

Author: ajohns

src/rez/pip.py

@@ -6,7 +6,7 @@
 from rez.vendor.distlib.util import parse_name_and_version
 from rez.vendor.enum.enum import Enum
 from rez.resolved_context import ResolvedContext
-from rez.system import popen
+from rez.utils.system import popen
 from rez.utils.logging_ import print_debug, print_info, print_warning
 from rez.exceptions import BuildError, PackageFamilyNotFoundError, \
     PackageNotFoundError, convert_errors

src/rez/release_vcs.py

@@ -4,6 +4,7 @@
 from rez.utils.system import popen
 from rez.utils.logging_ import print_debug
 from rez.utils.filesystem import walk_up_dirs
+from pipes import quote
 import subprocess
 
 
@@ -201,7 +202,8 @@ def export(cls, revision, path):
 
     def _cmd(self, *nargs):
         """Convenience function for executing a program such as 'git' etc."""
-        cmd_str = ' '.join(nargs)
+        cmd_str = ' '.join(map(quote, nargs))
+
         if self.package.config.debug("package_release"):
             print_debug("Running command: %s" % cmd_str)
 

src/rez/rex.py

@@ -12,7 +12,7 @@
 from rez.exceptions import RexError, RexUndefinedVariableError, RezSystemError
 from rez.util import shlex_join
 from rez.utils import reraise
-from rez.system import popen
+from rez.utils.system import popen
 from rez.utils.sourcecode import SourceCode, SourceCodeError
 from rez.utils.data_utils import AttrDictWrapper
 from rez.utils.formatting import expandvars

src/rez/shells.py

@@ -4,10 +4,11 @@
 from rez.rex import RexExecutor, ActionInterpreter, OutputStyle
 from rez.util import which, shlex_join
 from rez.utils.logging_ import print_warning
+from rez.utils.system import popen
+from rez.system import system
 from rez.exceptions import RezSystemError
 from rez.rex import EscapedString
 from rez.config import config
-from rez.system import system, popen
 import subprocess
 import os.path
 import pipes

src/rez/utils/graph_utils.py

@@ -9,7 +9,7 @@
 from ast import literal_eval
 from rez.config import config
 from rez.vendor.pydot import pydot
-from rez.system import popen
+from rez.utils.system import popen
 from rez.utils.formatting import PackageRequest
 from rez.exceptions import PackageRequestError
 from rez.vendor.pygraph.readwrite.dot import read as read_dot