diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-11-28 19:55:53 -0500 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-11-28 19:55:53 -0500 |
commit | b2b6c78e3179cef66cd4e9dcea7f9003f409ce8b (patch) | |
tree | 2355b55efce971b6c7044b1f04b4a3730d2da50f /devel/management/commands/pgp_import.py | |
parent | 0877f0389f187cf2cbf026c73b27071857d3e6f7 (diff) | |
parent | fab8d437929fce202b11707e1cacbc079f61edbc (diff) |
Merge tag 'release_2013-11-25' into archweb-generic
Django 1.6 upgrade and other changes
Conflicts:
templates/news/list.html
templates/public/index.html
Diffstat (limited to 'devel/management/commands/pgp_import.py')
-rw-r--r-- | devel/management/commands/pgp_import.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/devel/management/commands/pgp_import.py b/devel/management/commands/pgp_import.py index faa9ff5e..3f557fe9 100644 --- a/devel/management/commands/pgp_import.py +++ b/devel/management/commands/pgp_import.py @@ -134,7 +134,7 @@ def import_keys(keyring): logger.info("creating or finding %d keys", len(keydata)) created_ct = updated_ct = 0 - with transaction.commit_on_success(): + with transaction.atomic(): finder = UserFinder() # we are dependent on parents coming before children; parse_keydata # uses an OrderedDict to ensure this is the case. @@ -232,7 +232,7 @@ def import_signatures(keyring): logger.info("creating or finding up to %d signatures", len(pruned_edges)) created_ct = updated_ct = 0 - with transaction.commit_on_success(): + with transaction.atomic(): for edge in pruned_edges: sig, created = PGPSignature.objects.get_or_create( signer=edge.signer, signee=edge.signee, |