From 8314efdfd5c0138184dd8a8cb86d56f00ae7e6dd Mon Sep 17 00:00:00 2001
From: ThomasV <thomasv@gitorious>
Date: Thu, 2 Apr 2015 18:01:31 +0200
Subject: [PATCH] fix #802

---
 scripts/merchant/merchant.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/merchant/merchant.py b/scripts/merchant/merchant.py
index 69a33b4e3..507ab2b84 100644
--- a/scripts/merchant/merchant.py
+++ b/scripts/merchant/merchant.py
@@ -89,7 +89,7 @@ def on_wallet_update():
             if not tx: continue
             if wallet.verifier.get_confirmations(tx_hash) < requested_confs: continue
             for o in tx.outputs:
-                o_address, o_value = o
+                o_type, o_address, o_value = o
                 if o_address == addr:
                     value += o_value