Add better support for getting the path to crosutils.

lib/cros_build_lib.py

 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Common python commands used by various build scripts."""
 
 import inspect
 import os
 import re
 import subprocess
 import sys
 
 _STDOUT_IS_TTY = hasattr(sys.stdout, 'isatty') and sys.stdout.isatty()
-CROSUTILS_DIRECTORY = os.path.dirname(os.path.dirname(
-    os.path.realpath(__file__)))
 
 # TODO(sosa):  Move logging to logging module.
 
 class RunCommandException(Exception):
   """Raised when there is an error in RunCommand."""
   pass
 
 
 def GetCallerName():
   """Returns the name of the calling module with __main__."""
@@ skipping 293 matching lines @@
 
 
 def UnmountImage(root_dir, stateful_dir):
   """Unmounts a Chromium OS image specified by mount dir points."""
   RunCommand(['./mount_gpt_image.sh',
               '--unmount',
               '--rootfs_mountpt=%s' % root_dir,
               '--stateful_mountpt=%s' % stateful_dir,
              ], print_cmd=False, redirect_stdout=True, redirect_stderr=True,
              cwd=CROSUTILS_DIRECTORY)
+
+
+def GetCrosUtilsPath(from_source=True):

[petkov, 2011/03/28 20:48:56]

s/from_source/to_src/

[sosa, 2011/03/28 20:57:34]

renamed to source_path_dir

On 2011/03/28 20:48:56, petkov wrote:
Done.

+  """Return the path to src/scripts.
+
+  Args:
+    from_src:  If True, returns the path to the src location.
+  """
+  if IsInsideChroot():
+    if from_source:
+      return os.path.join(os.getenv('HOME'), 'trunk', 'src', 'scripts')
+    else:

[petkov, 2011/03/28 20:48:56]

remove?

[sosa, 2011/03/28 20:57:34]

Done.

+      return os.path.join('/usr/lib/crosutils')
+
+  # Outside the chroot => from_source.
+  return os.path.join(os.path.dirname(os.path.realpath(__file__)), '..')
+
+
+# TODO(sosa): Copied from chromite.

[petkov, 2011/03/28 20:48:56]

what's left to do?

[sosa, 2011/03/28 20:57:34]

Done.

+def IsInsideChroot():
+  """Returns True if we are inside chroot."""
+  return os.path.exists('/etc/debian_chroot')
+
+
+# TODO(sosa): Remove once all callers use method.
+CROSUTILS_DIRECTORY = GetCrosUtilsPath(True)

[petkov, 2011/03/28 20:48:56]

you can still keep the constant at the beginning of the file, no?

[sosa, 2011/03/28 20:57:34]

I thought so too, but python complains.  It's probably the def order for
globals.

On 2011/03/28 20:48:56, petkov wrote: