loman: realpath, not readlink
os.readlink() fails with "Invalid argument" if the path is not a
symlink.
loman: Unhandled exception:
Traceback (most recent call last):
File "/mnt/host/source/chromite/bin/loman", line 181, in <module>
DoMain()
File "/mnt/host/source/chromite/bin/loman", line 177, in DoMain
commandline.ScriptWrapperMain(FindTarget)
File "/mnt/host/source/chromite/lib/commandline.py", line 1038, in ScriptWrapperMain
ret = target(argv[1:])
File "/mnt/host/source/chromite/scripts/loman.py", line 159, in main
if os.path.basename(os.readlink(manifest_sym_path)) == 'minilayout.xml':
OSError: [Errno 22] Invalid argument: '/mnt/host/source/.repo/manifest.xml'
BUG=none
TEST=`cros-workon-${BOARD} start ...` on minilayout
Change-Id: Id4bbaa9816b847e008a7c0bf0f31b749c18ce325
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/2506402
Reviewed-by: Stephane Belmon <sbelmon@google.com>
Commit-Queue: Brian Norris <briannorris@chromium.org>
Tested-by: Brian Norris <briannorris@chromium.org>
diff --git a/scripts/loman.py b/scripts/loman.py
index 2453ab3..7097067 100644
--- a/scripts/loman.py
+++ b/scripts/loman.py
@@ -156,7 +156,7 @@
options.local_manifest_path = os.path.join(repo_dir, 'local_manifest.xml')
manifest_sym_path = os.path.join(repo_dir, 'manifest.xml')
- if os.path.basename(os.readlink(manifest_sym_path)) == 'minilayout.xml':
+ if os.path.basename(os.path.realpath(manifest_sym_path)) == 'minilayout.xml':
_AssertNotMiniLayout()
# For now, we only support the add command.
