qwc-open
/
pybackive
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add missing environment to shell script execution

This commit is contained in:
Marcel Otte 2021-05-26 21:46:47 +02:00
parent 2d765d6bf2
commit 83e0bdd63f
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
backive/core/backup.py
View File

@ -26,11 +26,12 @@ class Backup:
else: else:
break break
async def stream_subprocess(self, cmd, outcb, errcb): async def stream_subprocess(self, cmd, environ, outcb, errcb):
proc = await asyncio.create_subprocess_shell( proc = await asyncio.create_subprocess_shell(
cmd, cmd,
stdout=asyncio.subprocess.PIPE, stdout=asyncio.subprocess.PIPE,
stderr=asyncio.subprocess.PIPE, stderr=asyncio.subprocess.PIPE,
env=environ
) )
await asyncio.wait([ await asyncio.wait([
@ -54,11 +55,15 @@ class Backup:
)).config.get("mountname") )).config.get("mountname")
) )
backup_env["BACKIVE_TARGET_DIR"] = os.path.join( backup_env["BACKIVE_TARGET_DIR"] = os.path.join(
backup_env["BACKIVE_MOUNT"], (await Config().get_preferences()).get("mount_root"),
backup_env["BACKIVE_TO"] (await Config().get_device(
self.config.get("target_device")
)).config.get("mountname"),
self.config.get("to")
) )
proc = await self.stream_subprocess( proc = await self.stream_subprocess(
"""mkdir -p {}""".format( backup_env["BACKIVE_TARGET_DIR"]), """mkdir -p {}""".format( backup_env["BACKIVE_TARGET_DIR"]),
backup_env,
lambda x: logging.debug("STDOUT: %s", x), lambda x: logging.debug("STDOUT: %s", x),
lambda x: logging.debug("STDERR: %s", x), lambda x: logging.debug("STDERR: %s", x),
) )
@ -77,6 +82,7 @@ class Backup:
# "set -x; chown -R {} ${{BACKIVE_MOUNT}}/${{BACKIVE_TO}};".format(user) + # "set -x; chown -R {} ${{BACKIVE_MOUNT}}/${{BACKIVE_TO}};".format(user) +
# "sudo -E -u {} sh -c '".format(user) + # "sudo -E -u {} sh -c '".format(user) +
self.config.get("script"), self.config.get("script"),
backup_env,
lambda x: logging.debug("STDOUT: %s", x), lambda x: logging.debug("STDOUT: %s", x),
lambda x: logging.debug("STDERR: %s", x), lambda x: logging.debug("STDERR: %s", x),
) )