save cookies even in case of urllib2.HTTPError exceptions [bnc#378421]

osc/core.py

@@ -1385,12 +1385,15 @@ def http_request(method, url, headers={}, data=None, file=None):
                 else:
                     raise
 
-    # this handling is currently considered as temporary workaround, bug #378421
     try:
         fd = urllib2.urlopen(req, data=data)
-    finally:
+
+    except urllib2.HTTPError:
+        # make sure that cookies are saved nevertheless
         if hasattr(conf.cookiejar, 'save'):
             conf.cookiejar.save(ignore_discard=True)
+        # handle the exception elsewhere
+        raise
 
     if filefd: filefd.close()