diff options
author | Dan McGee <dan@archlinux.org> | 2013-11-06 21:17:27 -0600 |
---|---|---|
committer | Dan McGee <dan@archlinux.org> | 2013-11-06 21:17:27 -0600 |
commit | ee6002c911952ddc8cfd07fded3de2c9b0193dc6 (patch) | |
tree | 09e1d0d8e1aba35289d62b95b47b318ebd8a1527 /devel/management/commands/pgp_import.py | |
parent | 86f9d6788e22376560ca1a56e86c8f679b832907 (diff) |
Django 1.6 upgrade, deprecation cleanup
PendingDeprecationWarning: commit_on_success is deprecated in favor of atomic.
Signed-off-by: Dan McGee <dan@archlinux.org>
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, |