← Back to branch summary

~ubuntu-branches/ubuntu/raring/nova/raring-proposed

« back to all changes in this revision

Viewing changes to nova/cells/utils.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Chuck Short, James Page
  • Date: 2013-03-20 12:59:22 UTC
  • mfrom: (1.1.69)
  • Revision ID: package-import@ubuntu.com-20130320125922-ohvfav96lemn9wlz
Tags: 1:2013.1~rc1-0ubuntu1
[ Chuck Short ]
* New upstream release.
* debian/patches/avoid_setuptools_git_dependency.patch: Refreshed.
* debian/control: Clean up dependencies:
  - Dropped python-gflags no longer needed.
  - Dropped python-daemon no longer needed.
  - Dropped python-glance no longer needed.
  - Dropped python-lockfile no longer needed.
  - Dropped python-simplejson no longer needed.
  - Dropped python-tempita no longer needed.
  - Dropped python-xattr no longer needed.
  - Add sqlite3 required for the testsuite.

[ James Page ]
* d/watch: Update uversionmangle to deal with upstream versioning
  changes, remove tarballs.openstack.org. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/cells/utils.py
56
56
 
57
57
def cell_with_item(cell_name, item):
58
58
    """Turn cell_name and item into <cell_name>@<item>."""
 
59
    if cell_name is None:
 
60
        return item
59
61
    return cell_name + _CELL_ITEM_SEP + str(item)
60
62
 
61
63
 
62
64
def split_cell_and_item(cell_and_item):
63
65
    """Split a combined cell@item and return them."""
64
 
    return cell_and_item.rsplit(_CELL_ITEM_SEP, 1)
 
66
    result = cell_and_item.rsplit(_CELL_ITEM_SEP, 1)
 
67
    if len(result) == 1:
 
68
        return (None, cell_and_item)
 
69
    else:
 
70
        return result
65
71
 
66
72
 
67
73
def _add_cell_to_service(service, cell_name):