TMP5

jdavcs · Sep 1, 2024 · 28242a5 · 28242a5
1 parent 008731f
commit 28242a5
Showing 1 changed file with 16 additions and 19 deletions.
diff --git a/lib/galaxy/model/security.py b/lib/galaxy/model/security.py
@@ -1468,28 +1468,25 @@ def set_user_group_and_role_associations(
 
     def set_foo(self, group, user_ids):
         """ debugging CI """
-        try:
-            delete_stmt = delete(UserGroupAssociation).where(UserGroupAssociation.group_id == group.id)
-            insert_values = [{"group_id": group.id, "user_id": user_id} for user_id in user_ids]
-            self._set_associations(group, UserGroupAssociation, delete_stmt, insert_values)
+        delete_stmt = delete(UserGroupAssociation).where(UserGroupAssociation.group_id == group.id)
+        insert_values = [{"group_id": group.id, "user_id": user_id} for user_id in user_ids]
+        self._set_associations(group, UserGroupAssociation, delete_stmt, insert_values)
 
-            if self.sa_session.bind.dialect.name == "sqlite":
-                self.sa_session.execute(text("PRAGMA foreign_keys = ON;"))
-            self.sa_session.execute(delete_stmt)
+        if self.sa_session.bind.dialect.name == "sqlite":
+            self.sa_session.execute(text("PRAGMA foreign_keys = ON;"))
+        self.sa_session.execute(delete_stmt)
 
-            try:
-                self.sa_session.execute(insert(UserGroupAssociation), insert_values)
-            except IntegrityError as ie:
-                self.sa_session.rollback()
-                if is_unique_constraint_violation(ie):
-                    raise RequestParameterInvalidException("BAD: DUPLICATE")
-                elif is_foreign_key_violation(ie):
-                    raise RequestParameterInvalidException("BAD: INVALID ID")
-                else:
-                    raise
+        try:
+            self.sa_session.execute(insert(UserGroupAssociation), insert_values)
+        except IntegrityError as ie:
+            self.sa_session.rollback()
+            if is_unique_constraint_violation(ie):
+                raise RequestParameterInvalidException("BAD: DUPLICATE")
+            elif is_foreign_key_violation(ie):
+                raise RequestParameterInvalidException("BAD: INVALID ID")
+            else:
+                raise
 
-        except Exception:
-            raise
         self.sa_session.commit()