Merge remote-tracking branch 'origin/master'

bin/bombshell-client

@@ -193,8 +193,6 @@ def write(dst, buffer, l):
     while len(mv):
         dst.write(mv)
         writtenthisloop = len(mv)
-        #logging.debug("write: Sent %s bytes to sink %s", writtenthisloop, dst)
-        #logging.debug("write: %s", mv[:writtenthisloop].tobytes())
         if writtenthisloop is None or writtenthisloop < 1:
             raise Exception("copy: Failed to write any bytes")
         mv = mv[writtenthisloop:]
@@ -240,8 +238,6 @@ class DataMultiplexer(MyThread):
           self.sink.write(header)
           continue
         l = readthisloop
-        #logging.debug("mux: Received %s bytes from source %s", l, n)
-        #logging.debug("mux: %s", buffer[:l])
         header = struct.pack(PACKFORMAT, n, True, l)
         self.sink.write(header)
         write(self.sink, buffer, l)

build.parameters

@@ -0,0 +1 @@
+["RELEASE": "25 34"]

connection_plugins/qubes.py

@@ -175,6 +175,7 @@ def fetch(in_path, bufsize):
             except (IOError, OSError) as e:
                 sys.stdout.write(b'N\n')
                 encode_exception(e, sys.stdout)
+                f.close()
                 return
             sys.stdout.write('{}\n'.format(len(data)).encode('ascii'))
             if len(data) == 0:
@@ -182,8 +183,7 @@ def fetch(in_path, bufsize):
                 break
             sys.stdout.write(data)
             sys.stdout.flush()
-    finally:
-        f.close()
+    f.close()
 
 
 if __name__ == '__main__':
@@ -268,6 +268,7 @@ class Connection(ConnectionBase):
             self.transport_cmd = kwargs['transport_cmd']
             return
         self.transport_cmd = distutils.spawn.find_executable('qrun')
+        self.transport_cmd = None
         if not self.transport_cmd:
             self.transport_cmd = os.path.join(
                 os.path.dirname(__file__),