ui: Additional Pithos versioninfo.xml client type

[snf-cloudcms] / cloudcms / forms.py

diff --git a/cloudcms/forms.py b/cloudcms/forms.py
index c14c909..caac453 100644 (file)
--- a/cloudcms/forms.py
+++ b/cloudcms/forms.py
@@ -49,7 +49,7 @@ RESIZE_GEOMETRY = getattr(settings, 'CMS_RST_IMPORT_RESIZE_GEOMETRY',
 
 def service_from_filename(rst):
     fname = os.path.basename(rst).replace(".rst","")
-    service_slug = DEFAULT_SERVICE_MAP.get(fname, None)
+    service_slug = SERVICE_MAP.get(fname, None)
     if not service_slug:
         return None
 
@@ -150,7 +150,6 @@ class RstZipImportForm(forms.Form):
             except Exception, e:
                 try:
                     transaction.savepoint_rollback(sid)
-                    transaction.rollback()
                 except Exception, e:
                     logger.exception("Can not rollback")
                 logger.exception("Failed to clean existing data")