diff --git a/doc/Makefile.am b/doc/Makefile.am index c115c2c..78c883e 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -24,7 +24,7 @@ morituri.ics: $(top_srcdir)/morituri.doap man_MANS = rip.1 rip.1: $(top_srcdir)/morituri/extern/python-command/scripts/help2man $(top_srcdir)/morituri - PYTHONPATH=$(top_srcdir) $(PYTHON) $(top_srcdir)/morituri/extern/python-command/scripts/help2man morituri.rip.main.Rip rip > rip.1 + PYTHONPATH=$(top_srcdir):$(PYTHONPATH) $(PYTHON) $(top_srcdir)/morituri/extern/python-command/scripts/help2man morituri.rip.main.Rip rip > rip.1 clean-local: @rm -rf reference diff --git a/morituri/common/program.py b/morituri/common/program.py index d340fdd..15cb751 100644 --- a/morituri/common/program.py +++ b/morituri/common/program.py @@ -92,13 +92,13 @@ class Program(log.Loggable): """ Load the given device. """ - os.system('eject -t %s' % device) + os.system('@utillinux@/bin/eject -t %s' % device) def ejectDevice(self, device): """ Eject the given device. """ - os.system('eject %s' % device) + os.system('@utillinux@/bin/eject %s' % device) def unmountDevice(self, device): """ @@ -112,7 +112,7 @@ class Program(log.Loggable): proc = open('/proc/mounts').read() if device in proc: print 'Device %s is mounted, unmounting' % device - os.system('umount %s' % device) + os.system('@utillinux@/bin/umount %s' % device) def getFastToc(self, runner, toc_pickle, device): """ Submodule morituri/extern/python-command contains modified content diff --git a/morituri/program/cdparanoia.py b/morituri/program/cdparanoia.py index 46176d5..fce14a5 100644 --- a/morituri/program/cdparanoia.py +++ b/morituri/program/cdparanoia.py @@ -278,7 +278,7 @@ class ReadTrackTask(log.Loggable, task.Task): stopTrack, stopOffset) bufsize = 1024 - argv = ["cdparanoia", "--stderr-progress", + argv = ["@cdparanoia@/bin/cdparanoia", "--stderr-progress", "--sample-offset=%d" % self._offset, ] if self._device: argv.extend(["--force-cdrom-device", self._device, ]) @@ -551,7 +551,7 @@ _VERSION_RE = re.compile( def getCdParanoiaVersion(): getter = common.VersionGetter('cdparanoia', - ["cdparanoia", "-V"], + ["@cdparanoia@/bin/cdparanoia", "-V"], _VERSION_RE, "%(version)s %(release)s") diff --git a/morituri/program/cdrdao.py b/morituri/program/cdrdao.py index c6fba64..c4d0306 100644 --- a/morituri/program/cdrdao.py +++ b/morituri/program/cdrdao.py @@ -257,7 +257,7 @@ class CDRDAOTask(ctask.PopenTask): def start(self, runner): self.debug('Starting cdrdao with options %r', self.options) - self.command = ['cdrdao', ] + self.options + self.command = ['@cdrdao@/bin/cdrdao', ] + self.options ctask.PopenTask.start(self, runner) @@ -515,7 +515,7 @@ _VERSION_RE = re.compile( def getCDRDAOVersion(): getter = common.VersionGetter('cdrdao', - ["cdrdao"], + ["@cdrdao@/bin/cdrdao"], _VERSION_RE, "%(version)s")