From fbddb2a65b33a9fff7ea735b41c4a5d992f8715b Mon Sep 17 00:00:00 2001 From: jackjack-jj Date: Sun, 26 May 2013 20:59:59 +0200 Subject: [PATCH] little improvement for deletions --- pywallet.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pywallet.py b/pywallet.py index 4994310..2de969d 100755 --- a/pywallet.py +++ b/pywallet.py @@ -1,6 +1,6 @@ #!/usr/bin/env python #-*- coding: utf-8 -*- -pywversion="2.0.8" +pywversion="2.0.9" never_update=False # @@ -1785,9 +1785,13 @@ def delete_from_wallet(db_env, walletfile, typedel, kd): if typedel == "tx": if type == "tx": - if keydel == inversetxid(kds.read_bytes(32).encode('hex_codec')) or keydel == "all": + if keydel == "all" or keydel == inversetxid(kds.read_bytes(32).encode('hex_codec')): db.delete(key) deleted_items+=1 + if keydel == "all": + continue + else: + break elif typedel == "key": if type == "key" or type == "ckey": if keydel == public_key_to_bc_address(kds.read_bytes(kds.read_compact_size())):