--- euca2ools-1.3.1/bin/euca-bundle-image.userint 2011-02-17 18:30:26.146631108 -0800 +++ euca2ools-1.3.1/bin/euca-bundle-image 2011-02-17 18:31:04.443530269 -0800 @@ -192,11 +192,6 @@ def main(): if image_path and cert_path and private_key_path and user \ and ec2cert_path: try: - int(user) - except ValueError: - print 'Invalid user', user - sys.exit(1) - try: euca.validate_file(image_path) except FileValidationError: print 'Invalid image' --- euca2ools-1.3.1/bin/euca-bundle-vol.userint 2011-02-17 18:49:23.467342150 -0800 +++ euca2ools-1.3.1/bin/euca-bundle-vol 2011-02-17 18:56:42.898494401 -0800 @@ -230,7 +230,7 @@ def main(): cert_path = euca.get_environ('EC2_CERT') private_key_path = euca.get_environ('EC2_PRIVATE_KEY') ec2cert_path = euca.get_environ('EUCALYPTUS_CERT') - user_string = euca.get_environ('EC2_USER_ID') + user = euca.get_environ('EC2_USER_ID') except NotFoundError: sys.exit(1) @@ -249,13 +249,6 @@ def main(): fstab_path = None generate_fstab = False product_code_string = None - if user_string: - try: - user = int(user_string) - except ValueError: - print 'Invalid user', user_string - sys.exit() - user = user_string for (name, value) in euca.opts: if name in ('-h', '--help'): @@ -266,8 +259,7 @@ def main(): private_key_path = value elif name in ('-u', '--user'): try: - value = value.replace('-', '') - user = int(value) + user = value.replace('-', '') except ValueError: print 'Invalid user', value sys.exit()