# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: andreambu@gmail.com-20100205132640-cbll1bygi0t7joq6
# target_branch: http://bazaar.launchpad.net/~stani/phatch/trunk/
# testament_sha1: 113e4a70f5e57d078d1edc71680690da774927b5
# timestamp: 2010-02-05 14:29:37 +0100
# base_revision_id: spe.stani.be@gmail.com-20100204115634-\
#   93qx0jvld73fekl8
# 
# Begin patch
=== modified file 'phatch/actions/lossless_jpeg.py'
--- phatch/actions/lossless_jpeg.py	2009-10-02 03:02:08 +0000
+++ phatch/actions/lossless_jpeg.py	2010-02-05 13:26:40 +0000
@@ -272,14 +272,12 @@
     def call(self,photo, info, utility):
         format = info['format']
         if format == 'JPEG':
-            super(JpegUtility, self).execute(photo)
+            system.call(utility.get_command_line(self,photo, info['path'],
+                self.get_lossless_filename(photo,info)))
         else:
             raise Exception('%s:\n%s' \
                 % (LOSSLESS_JPEG_FORMAT_ERROR%format, info['path']))
 
-        system.call(utility.get_command_line(self,photo, info['path'],
-            self.get_lossless_filename(photo,info)))
-
     def get_relevant_field_labels(self):
         return super(LossLessSaveUtilityMixin,self)\
             .get_relevant_field_labels(['File Name','In'])

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWaqZ0MQAAYTfgEBUWOf/93IE
AAq////wUAONRr2ZxcGK4SSp4Qp4QyaaMRqZTxNJk0PUaNDIMkBGENFPTUeoep6jQAAAAGQkwRPS
n6k0z0qaM01PJGTGhpqHpMhgAAAAAAAAAAEkkamNU2p6nmoTyepMQAHqAA0aeJDZiUdrNhrvusgX
SvzhsYLnUufO923OlmP9Pb40sMw4bx/XPCIiMoneuHLw2bxw+PS1eSH3QVxrFMcbd5VCLev3udWf
vfk3D8McpSGrSewhy4qsUbdFct8TIO7QkQp/hzgc+a5r7XAcyG1QVorAjXkEPXKTEC6AI3bHKhfr
UFt8wwgZKpvMyoTMt42nSD5cxEgo7MIkDbYVlI0NHXKHwjXRGoNNB4DlhS7MYNCE5d3awjFBCYOV
8hJcRliQbwQ4JANx4RvBtoLokXKAtZWIsfRrpVDwXJj9he8isDa4PiHot+dS8e62LqtAxJzGR0jh
0T8OHRiaclA4eHGWVufddSLzdccVpRpBlCH6xZWMxsEHqE0io23FQbeCiY2TtmdtMK7GiMoP1i45
WByUpRlzzhMs5gUGa6hBEnhpr+yEJ2VLCxxJsXJomVyOWqbskEwwi1dU204BoI1kfRQ5SqvRwMQH
wTq3i2UtG5GS3H6uA8yZ9LXoUHJmd4caeKUexQCjm8VDrnLBvB58b7jy1weSz/MNaR075EtJojHa
Tja/aIc86JCx7ncrSvzDLSLuovJgMhb0caR3DbMTUdBU8ee3C2bNfMke88Maq93TiNPoKlWeClUX
xTXlFBwuOcQJMLcOm6ADY+dy9VdrtwGLhespAfRtexiV/I7LY7ESGoZzzusWFe1qPlxyEY3GKZa7
35LJSqRpMCAUqa0eWmUta6WmUTbApTHEMOOqWvmjJTFRBSRznR6C3JF9xqDVCZxYqw4RUFZIn67U
z8C1IzhMo+Iaq/qfdfF+YKsOYNvBXkdsNgopyw0NqnC9Ua0hwOFUDOM6YrTweiYyTaDYK6D8cWy8
4iG87SE+1I0RX9YBe19ZGUe8fYnhTujAGmZLNBlmDvdFD2WzMqMDEb0HcIoUQ6s/0G1imDt3Lo5f
F4SZ/oXW3My7QHmwKk6HXrVxf5qmQW5Y4JwZY4gQRNysJeUwY7XaI5SSBn7mClp82+spbgyg1Ksq
RVaUA4WVDZgxnRvjLT5CdK5v4UIngOdVqMoEb8Kjm8mCgIsrSwDV6v2vz0YcANSq+PwWmehTFLQZ
blQf/i7kinChIVUzoYg=