summaryrefslogtreecommitdiffstats
path: root/devel/management/commands/pgp_import.py
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2013-11-26 04:10:25 +0100
committerDan McGee <dan@archlinux.org>2013-11-26 04:10:25 +0100
commit108cfaa8df3b94031a3436fbb71c76fdc0650ba1 (patch)
tree61c30085b49e63c6605dfebac3bef5e123cbaa70 /devel/management/commands/pgp_import.py
parent06317908f73420224fce0c400048c3b7dcfc8abb (diff)
parent071bd6bd71f681c45048fc0a0961e58d43d44d48 (diff)
downloadarchweb-108cfaa8df3b94031a3436fbb71c76fdc0650ba1.tar.gz
archweb-108cfaa8df3b94031a3436fbb71c76fdc0650ba1.tar.xz
Merge branch 'django-1.6'
Diffstat (limited to 'devel/management/commands/pgp_import.py')
-rw-r--r--devel/management/commands/pgp_import.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/devel/management/commands/pgp_import.py b/devel/management/commands/pgp_import.py
index faa9ff5..3f557fe 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,