Merge pull request redis#323 from paykroyd/exec_without_mulit

Do not discard pipeline unless in multi.
path · Mar 1, 2013 · ba7b768 · ba7b768
2 parents 8967403 + 01b1e22
commit ba7b768
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/redis/client.py b/redis/client.py
@@ -1741,7 +1741,8 @@ def _execute_transaction(self, connection, commands, raise_on_error):
         try:
             response = self.parse_response(connection, '_')
         except ExecAbortError:
-            self.immediate_execute_command('DISCARD')
+            if self.explicit_transaction:
+                self.immediate_execute_command('DISCARD')
             if errors:
                 raise errors[0][1]
             raise sys.exc_info()[1]