Merge lp:~cmiller/desktopcouch/u1-repl-prefix-http-error-causes-future-nameerrors into lp:desktopcouch

[Chad Miller]

Fix a problem with ubuntuone replication that will cause NameErrors if the first attempt at replication throws an exception. In recent changes, this code was left indented at the wrong level. (LP: #655267)

[Vincenzo Di Somma (vds)]

review: Approve

[dobey (dobey)]

review: Approve

=== modified file 'desktopcouch/replication_services/ubuntuone.py'
--- desktopcouch/replication_services/ubuntuone.py	2010-09-27 21:57:29 +0000
+++ desktopcouch/replication_services/ubuntuone.py	2010-10-06 12:29:43 +0000
@@ -80,12 +80,12 @@
                                                oauth_data['consumer_secret'])
                 access_token = oauth.OAuthToken(oauth_data['token'],
                                                 oauth_data['token_secret'])
+                self.oauth_header = get_oauth_request_header(
+                        consumer, access_token, url)
             except:
                 logging.exception("Could not get access token from sso.")
                 raise ValueError("No access token.")
 
-        self.oauth_header = get_oauth_request_header(
-                consumer, access_token, url)
 
         client = httplib2.Http()
         resp, content = client.request(url, "GET", headers=self.oauth_header)