# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: harsha@gluster.com-20110219000706-j14euotpll2p4x47
# target_branch: bzr+ssh://bazaar.launchpad.net/%2Bbranch/nova/
# testament_sha1: 5da050abfcd4256f55444d65ef4db06052e2df81
# timestamp: 2011-02-18 16:18:58 -0800
# base_revision_id: tarmac-20110218205949-2l1wetsrkindj2fd
# 
# Begin patch
=== modified file 'bin/nova-manage'
--- bin/nova-manage	2011-02-17 21:39:03 +0000
+++ bin/nova-manage	2011-02-19 00:07:06 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
@@ -291,7 +291,11 @@
         """creates a new admin and prints exports
         arguments: name [access] [secret]"""
         try:
-            user = self.manager.create_user(name, access, secret, True)
+            if self.manager.get_user(name):
+                user = self.manager.create_user(name, access, secret, True)
+            else:
+                print "User '%s' already present, skipping.." % name
+                user = self.manager.get_user(name)
         except exception.DBError, e:
             _db_error(e)
         self._print_export(user)
@@ -300,7 +304,11 @@
         """creates a new user and prints exports
         arguments: name [access] [secret]"""
         try:
-            user = self.manager.create_user(name, access, secret, False)
+            if not self.manager.get_user(name):
+                user = self.manager.create_user(name, access, secret, False)
+            else:
+                print "User '%s' already present, skipping.." % name
+                user = self.manager.get_user(name)
         except exception.DBError, e:
             _db_error(e)
         self._print_export(user)
@@ -361,7 +369,10 @@
     def create(self, name, project_manager, description=None):
         """Creates a new project
         arguments: name project_manager [description]"""
-        self.manager.create_project(name, project_manager, description)
+        if not self.manager.get_project(name):
+            self.manager.create_project(name, project_manager, description)
+        else:
+            print "Project '%s' already present, skipping.." % name
 
     def modify(self, name, project_manager, description=None):
         """Modifies a project

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWWyAzU8AAcjfgARUeuf/93NA
RgC//9/wUAQsnu1Tndi0mtNwSSRomBMQ2ppppMEmj1HqAZGaIBkgmE00yT1RoaNAGgAADQBKaJNG
lPakybTVPUbIyZNT1NBoANADmATACYAATAAEwABJIBKeTENU2ympj0mp6IwjQAwnpIwPHdUdXeWJ
FfhhK5jYbhSEixe2cRhK6dscpMiPdcAM4zeTa2X4M0eI2XzadSbLFalEaIrakWZ/Gobw8t7Ztfo+
LxN/7jd94xe6UcWn9CqT3Nbf/JDnrKIV05J5OV+G9d0dhbr34Zx3cnJdzlBTJwajQwNQUMYMohiN
pCJdt6YWVamfwFkHnt41XrzV+ax6SyAzU6H7JQjDwed1VBb21CsFtxYRGTCOHDXSSvFUKppqbzBi
nRACuDUoEfQ5NGMAQtni5jKWVLQXM1w1groHZtrlsYVpRvum1Uqe+271+4h4YRiH1O1yYKOUtcFJ
YMwvlYxOIOBkLbMsGbaHS8qDaZ7MtWri2Ny1J+gwemiOsCq8peLYKgpqtxqUB7qLtY8xIKXTRnsb
VIJsW1QNDp2rUUQvGZ2EwpDMFrFMbOIZF0YmF2GUsZwuUk1m+ZiIZDKj7pwWcYAPvxaMQHAqVGCP
MpB6SOg2OV9yEPf1XiqtGnPDzq48Qym7wXBMLVzxSDvr1HRveDt7uWtm5asLWQvsqyo6KywQOLnS
BoIcQgHKazaSgl7UL1YZ0G301sGNmi0Lpg5A7woD0+zwWe2xCmlJp4NYjMsyXbjObLgc/nw4QJTh
Ajp47bbtvWl8LZ7hna+cuEm5f5xzZ27CWUJ/ACljtI2pi1GpOZpecvsLGsZd8mpxP0mrGW/cUay7
Jwjs96M7+CIMpONl3T1W0sjjq2+onwwbnXC7LMnjMEmwpiAxOfMXW1csdvfqbRTDG7o2nycXWgfr
9jlEfJMnAoNBJwF/M+GcfvLdRYnOnEkYL5C6IBvNCnUEQMNvBqvj8DkOUhslmO2+vcy6DOW9IOiP
VLXizJFvU6jT0v4xSmuOsT4jAr/P+TR8+ehrCCeR5NAPFKvkq17adMeevAGqVOsO62XVgLUvFGnJ
bArVE8yDcuQUAZ4ZlGcgz2Cw8Xogmn2JWgaFeF3UA9TBY7bTTjfOY9gISQiBmm3WAn6UWMyscMLD
clvpOSnpAcyYOj3lVwskH0kjtaBOYMsXLeWaRORNlpyFlnuZlGTUKgTVqmVcfYdiNPJDUKi9ySK2
XfAM49IZBW9F6eWZxOS2SlYqKtav9IJtECkuLKfwbmicVWQYugVXhccrJQXsYpE5bnGnpApkD3NU
4LRe7YMOzUC5X6Gyzp9I5cQElEdgglTTRltQrJvmK9zZZQGfB4iBMuBRi3LMzTJnCGA3aQNgG/TU
mWBD6TKgF8qc8uw9oNwchrVCiJqtKwu/xdyRThQkGyAzU8A=