Skip to content
Snippets Groups Projects
Commit 279f2c7d authored by Nikos Skalkotos's avatar Nikos Skalkotos
Browse files

Fix error message for non supported media source

parent 1f42adc8
No related branches found
No related tags found
No related merge requests found
...@@ -45,9 +45,6 @@ import time ...@@ -45,9 +45,6 @@ import time
from sendfile import sendfile from sendfile import sendfile
class DiskError(Exception):
pass
dd = get_command('dd') dd = get_command('dd')
dmsetup = get_command('dmsetup') dmsetup = get_command('dmsetup')
losetup = get_command('losetup') losetup = get_command('losetup')
...@@ -80,7 +77,8 @@ class Disk(object): ...@@ -80,7 +77,8 @@ class Disk(object):
return loop return loop
def _dir_to_disk(self): def _dir_to_disk(self):
raise NotImplementedError raise FatalError("Using a directory as media source is not supported "
"yet!")
def cleanup(self): def cleanup(self):
"""Cleanup internal data. This needs to be called before the """Cleanup internal data. This needs to be called before the
...@@ -103,10 +101,10 @@ class Disk(object): ...@@ -103,10 +101,10 @@ class Disk(object):
sourcedev = self.source sourcedev = self.source
mode = os.stat(self.source).st_mode mode = os.stat(self.source).st_mode
if stat.S_ISDIR(mode): if stat.S_ISDIR(mode):
success('looks like a directory') self.out.success('looks like a directory')
return self._losetup(self._dir_to_disk()) return self._losetup(self._dir_to_disk())
elif stat.S_ISREG(mode): elif stat.S_ISREG(mode):
success('looks like an image file') self.out.success('looks like an image file')
sourcedev = self._losetup(self.source) sourcedev = self._losetup(self.source)
elif not stat.S_ISBLK(mode): elif not stat.S_ISBLK(mode):
raise ValueError("Invalid media source. Only block devices, " raise ValueError("Invalid media source. Only block devices, "
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment