[euca2ools] Fix backtrace when --user-data-file does not exist [LP:726901]

[gholms]

commit 82410c430347b9e05b5222974ad2f6e7b83f2a8d
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Fri Mar 4 11:37:56 2011 -0800

    Fix backtrace when --user-data-file does not exist [LP:726901]

 euca2ools-1.3.1-userdata.patch |   12 ++++++++++++
 euca2ools.spec                 |    8 +++++++-
 2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/euca2ools-1.3.1-userdata.patch b/euca2ools-1.3.1-userdata.patch
new file mode 100644
index 0000000..3a21759
--- /dev/null
+++ b/euca2ools-1.3.1-userdata.patch
@@ -0,0 +1,12 @@
+--- euca2ools-1.3.1/bin/euca-run-instances.userdata	2011-03-04 11:31:20.797307269 -0800
++++ euca2ools-1.3.1/bin/euca-run-instances	2011-03-04 11:34:28.926404846 -0800
+@@ -36,7 +36,8 @@
+ import getopt
+ import sys
+ import os
+-from euca2ools import Euca2ool, Util, ConnectionFailed, print_instances
++from euca2ools import Euca2ool, Util, print_instances
++from euca2ools import FileValidationError, ConnectionFailed
+ 
+ usage_string = \
+     """
diff --git a/euca2ools.spec b/euca2ools.spec
index f224b1f..5349dcc 100644
--- a/euca2ools.spec
+++ b/euca2ools.spec
@@ -2,7 +2,7 @@
 
 Name:           euca2ools
 Version:        1.3.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Elastic Utility Computing Architecture Command-Line Tools
 
 Group:          Applications/Internet
@@ -47,6 +47,8 @@ Patch16:        euca2ools-1.3.1-userdash.patch
 # https://bugs.launchpad.net/euca2ools/+bug/667793
 # https://bugs.launchpad.net/euca2ools/+bug/672986
 Patch17:        euca2ools-1.3.1-fsid.patch
+# https://bugs.launchpad.net/euca2ools/+bug/726901
+Patch18:        euca2ools-1.3.1-userdata.patch
 
 Requires:       m2crypto
 Requires:       python-boto
@@ -87,6 +89,7 @@ Eucalyptus.  These tools are also compatible with Amazon AWS.
 %patch15 -p1
 %patch16 -p1
 %patch17 -p1
+%patch18 -p1
 
 
 %build
@@ -122,6 +125,9 @@ rm -rf %{buildroot}
 %doc README
 
 %changelog
+* Fri Mar  4 2011 Garrett Holmstrom <gholms at fedoraproject.org> - 1.3.1-7
+- Fix backtrace when --user-data-file does not exist [LP:726901]
+
 * Thu Feb 17 2011 Garrett Holmstrom <gholms at fedoraproject.org> - 1.3.1-6
 - Stop stripping leading '0's from user IDs [LP:479823]
 - Fix bad behavior with user IDs that contain '-'