mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2026-05-04 11:51:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add support for cros_workon of non-workon packages

Browse Source 
Added --remote flag, and some "NonWorkon" methods that complement the "Workon"
methods.

To add a non-workon project to the local_manifest.xml, specify a remote.
The remote tag will be added as part of the new entry in local_manifest.xml.

BUG=chromium-os:32247
TEST=In conjunction with a change in cros_workon, tested that non-workon
projects can be added to the local_manifest.xml.

Change-Id: I1bc4247532647e9bc5962acef988ab57445f4b0e
Signed-off-by: Andrew Chew <achew@nvidia.com>
Reviewed-on: https://gerrit.chromium.org/gerrit/26346
Reviewed-by: Rhyland Klein <rklein@nvidia.com>
Reviewed-by: David James <davidjames@chromium.org>
This commit is contained in:
Andrew Chew 2012-06-27 17:39:03 -07:00 committed by Gerrit
parent 71124e5362
commit 6202bf1190
1 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
bin/loman.py
View File

@ -35,7 +35,7 @@ class LocalManifest:
"""Parse the manifest."""
self._root = ElementTree.fromstring(self._text)
def AddProjectElement(self, element, workon='False'):
def AddProjectElement(self, element, workon='False', remote=None):
"""Add a new project element to the manifest tree.
Returns:
@ -50,18 +50,20 @@ class LocalManifest:
else:
return False
element.attrib['workon'] = workon
if remote is not None:
element.attrib['remote'] = remote
element.tail = '\n'
self._root.append(element)
return True
def AddProject(self, name, path, workon='False'):
def AddProject(self, name, path, workon='False', remote=None):
"""Add a workon project if it is not already in the manifest.
Returns:
True on success.
"""
element = ElementTree.Element('project', name=name, path=path)
return self.AddProjectElement(element, workon=workon)
return self.AddProjectElement(element, workon=workon, remote=remote)
def AddWorkonProjectElement(self, element):
return self.AddProjectElement(element, workon='True')
@ -69,6 +71,12 @@ class LocalManifest:
def AddWorkonProject(self, name, path):
return self.AddProject(name, path, workon='True')
def AddNonWorkonProjectElement(self, element, remote):
return self.AddProjectElement(element, workon='False', remote=remote)
def AddNonWorkonProject(self, name, path, remote):
return self.AddProject(name, path, workon='False', remote=remote)
def GetProject(self, name):
"""Accessor method for getting a project node from the manifest tree.
@ -90,7 +98,7 @@ def main(argv):
if not repo_dir:
Die("Unable to find repo dir.")
usage = 'usage: %prog add [options] <name>'
usage = 'usage: %prog add [options] <name> <path>'
parser = optparse.OptionParser(usage=usage)
parser.add_option('-w', '--workon', action='store_true', dest='workon',
default=False, help='Is this a workon package?')
@ -103,13 +111,15 @@ def main(argv):
parser.add_option('-d', '--default', dest='full_manifest',
default='%s/manifests/full.xml' % repo_dir,
help='Default manifest file to read.')
parser.add_option('-r', '--remote', dest='remote',
default=None)
(options, args) = parser.parse_args(argv[2:])
if len(args) < 1:
parser.error('Not enough arguments')
if argv[1] not in ['add']:
parser.error('Unsupported command: %s.' % argv[1])
if not options.workon:
parser.error('Adding of non-workon projects is currently unsupported.')
if not options.workon and options.remote is None:
parser.error('Adding non-workon projects requires a remote.')
name = args[0]
local_tree = _ReadManifest(options.local_manifest)
@ -117,13 +127,18 @@ def main(argv):
full_tree = _ReadManifest(options.full_manifest)
# Only add this project to local_manifest.xml if not in manifest.xml
if main_tree.GetProject(name) == None:
project_element = full_tree.GetProject(name)
if project_element == None:
Die('No project named, %s, in the default manifest.' % name)
success = local_tree.AddWorkonProjectElement(project_element)
if options.workon:
if main_tree.GetProject(name) is None:
project_element = full_tree.GetProject(name)
if project_element is None:
Die('No project named %s, in the default manifest.' % name)
success = local_tree.AddWorkonProjectElement(project_element)
if not success:
Die('Name "%s" already exists with a different path.' % name)
else:
success = local_tree.AddNonWorkonProject(name, args[1], options.remote)
if not success:
Die('name "%s" already exits with a different path.' % name)
Die('Name "%s" already exists with a different path.' % name)
try:
print >> open(options.local_manifest, 'w'), local_tree.ToString()