fixes

Author: acalcutt

r2/r2/lib/db/cassandra_compat.py

@@ -457,13 +457,12 @@ def __enter__(self):
         return self
 
     def __exit__(self, exc_type, exc, tb):
-        try:
+        # Only send if the body of the with-block succeeded.  If the body
+        # raised we skip the send (act like a rollback) and let the original
+        # exception propagate.  Any exception raised by send() propagates
+        # naturally — callers must see write failures.
+        if exc_type is None:
             self.send()
-        except Exception as e:
-            import sys
-            sys.stderr.write(f"CASSANDRA ERROR in Mutator.__exit__: {e}\n")
-            # don't raise during cleanup
-            return False
 
     def insert(self, key_or_cf, columns_or_key, ttl_or_columns=None, ttl=None):
         # Handle both calling conventions:

scripts/force_create_revs.py

@@ -19,7 +19,7 @@ def parse_args():
     p.add_argument('--root', help='Repository root (defaults to parent of scripts dir)')
     p.add_argument('--dry-run', action='store_true', help="Don't write; only show what would be done")
     p.add_argument('--force', action='store_true', help='Allow destructive writes')
-    return p.parse_args()
+    return p.parse_known_args()[0]
 
 
 def main():
@@ -56,11 +56,23 @@ def main():
             continue
 
         try:
-            wr = WikiRevision.create(wp._id, content, author=system_user, reason='Import from docs/policies')
+            wr = WikiRevision.create(wp._id, content, author=system_user._id36, reason='Import from docs/policies')
             print('Created revision', getattr(wr, '_id', None))
+            # Update the WikiPage to point at the new revision so that
+            # revise() won't skip it next time due to stale content.
+            wp.content = content
+            wp.revision = str(wr._id)
+            wp.last_edit_by = system_user._id36
+            wp._commit()
+            print('Updated WikiPage', wiki_name)
         except Exception as e:
+            import traceback
+            traceback.print_exc()
             print('Failed create for', wiki_name, e)
 
 
 if __name__ == '__main__':
     main()
+else:
+    # When loaded via tippr-run or paster run, execute main automatically
+    main()

scripts/force_revise_policies.py

@@ -59,4 +59,6 @@ def main():
 
 if __name__ == '__main__':
     main()
+else:
+    main()
 

scripts/init_policy_wiki_pages.py

@@ -199,7 +199,7 @@ def ensure_vault(name, author):
             if force:
                 print(f"  Wiki page exists; --force given, attempting update...")
                 try:
-                    existing_page.revise(content, author=system_user, reason="Updated from docs/policies/")
+                    existing_page.revise(content, author=system_user._id36, reason="Updated from docs/policies/")
                     print(f"  SUCCESS: Updated {display_name}\n")
                 except Exception as e:
                     print(f"  ERROR: Failed to revise existing page '{wiki_name}': {e}")
@@ -221,7 +221,7 @@ def ensure_vault(name, author):
                 print(f"  DEBUG: Frontpage name: '{getattr(Frontpage, 'name', 'N/A')}'")
 
                 wp = WikiPage.create(Frontpage, wiki_name)
-                wp.revise(content, author=system_user, reason="Initial creation from docs/policies/")
+                wp.revise(content, author=system_user._id36, reason="Initial creation from docs/policies/")
                 print(f"  SUCCESS: Created {display_name}\n")
             except Exception as e:
                 import traceback