diff --git a/src/utils/file.c b/src/utils/file.c
index c4ed9c72..e062a213 100644
--- a/src/utils/file.c
+++ b/src/utils/file.c
@@ -2717,6 +2717,14 @@ fio_send_file_write(FILE* out, send_file_state* st, char *buf, size_t len)
if (len == 0)
return true;
+#ifdef WIN32
+ if (st->read_size > st->write_size &&
+ _chsize_s(fileno(out), st->read_size) != 0)
+ {
+ elog(WARNING, "Could not change file size to %lld: %m", st->read_size);
+ return false;
+ }
+#endif
if (st->read_size > st->write_size &&
fseeko(out, st->read_size, SEEK_SET) != 0)
{
diff --git a/tests/helpers/ptrack_helpers.py b/tests/helpers/ptrack_helpers.py
index f8044a81..6b665097 100644
--- a/tests/helpers/ptrack_helpers.py
+++ b/tests/helpers/ptrack_helpers.py
@@ -982,7 +982,8 @@ def run_pb(self, command, asynchronous=False, gdb=False, old_binary=False, retur
else:
return self.output
except subprocess.CalledProcessError as e:
- raise ProbackupException(e.output.decode('utf-8'), self.cmd)
+ raise ProbackupException(e.output.decode('utf-8').replace("\r",""),
+ self.cmd)
def run_binary(self, command, asynchronous=False, env=None):
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy