napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[unpackfs] Fix typo's introduced in june

Browse Source
This commit is contained in:
Adriaan de Groot 2020-02-13 16:23:49 +01:00
parent 45a31a3022
commit 2bc296b468
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/modules/unpackfs/main.py
View File

@ -30,6 +30,7 @@ import sys
import tempfile import tempfile
from libcalamares import * from libcalamares import *
from libcalamares.utils import mount
import gettext import gettext
_ = gettext.translation("calamares-python", _ = gettext.translation("calamares-python",
@ -288,11 +289,11 @@ class UnpackOperation:
return return
if os.path.isdir(entry.source): if os.path.isdir(entry.source):
r = libcalamares.utils.mount(entry.source, imgmountdir, "", "--bind") r = mount(entry.source, imgmountdir, "", "--bind")
elif os.path.isfile(entry.source): elif os.path.isfile(entry.source):
r = libcalamares.utils.mount(entry.source, imgmountdir, entry.sourcefs, "loop") r = mount(entry.source, imgmountdir, entry.sourcefs, "loop")
else: # entry.source is a device else: # entry.source is a device
r = libcalamares.utils.mount(entry.source, imgmountdir, entry.sourcefs, "") r = mount(entry.source, imgmountdir, entry.sourcefs, "")
if r != 0: if r != 0:
raise subprocess.CalledProcessError(r, "mount") raise subprocess.CalledProcessError(r, "mount")