gaschz/ansible-qubes
1
0
Fork 0
mirror of https://github.com/Rudd-O/ansible-qubes.git synced 2025-03-01 14:22:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Manuel Amador (Rudd-O) 2022-03-29 16:41:40 +00:00
commit 08b33d1f7d
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/bombshell-client
View File

@ -193,8 +193,6 @@ def write(dst, buffer, l):
while len(mv): while len(mv):
dst.write(mv) dst.write(mv)
writtenthisloop = len(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: if writtenthisloop is None or writtenthisloop < 1:
raise Exception("copy: Failed to write any bytes") raise Exception("copy: Failed to write any bytes")
mv = mv[writtenthisloop:] mv = mv[writtenthisloop:]
@ -240,8 +238,6 @@ class DataMultiplexer(MyThread):
self.sink.write(header) self.sink.write(header)
continue continue
l = readthisloop 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) header = struct.pack(PACKFORMAT, n, True, l)
self.sink.write(header) self.sink.write(header)
write(self.sink, buffer, l) write(self.sink, buffer, l)

1
build.parameters Normal file
View File

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

5
connection_plugins/qubes.py
View File

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