pyrox.dev
1diff --git a/doc/Makefile.am b/doc/Makefile.am
2index c115c2c..78c883e 100644
3--- a/doc/Makefile.am
4+++ b/doc/Makefile.am
5@@ -24,7 +24,7 @@ morituri.ics: $(top_srcdir)/morituri.doap
6 man_MANS = rip.1
7
8 rip.1: $(top_srcdir)/morituri/extern/python-command/scripts/help2man $(top_srcdir)/morituri
9- PYTHONPATH=$(top_srcdir) $(PYTHON) $(top_srcdir)/morituri/extern/python-command/scripts/help2man morituri.rip.main.Rip rip > rip.1
10+ PYTHONPATH=$(top_srcdir):$(PYTHONPATH) $(PYTHON) $(top_srcdir)/morituri/extern/python-command/scripts/help2man morituri.rip.main.Rip rip > rip.1
11
12 clean-local:
13 @rm -rf reference
14diff --git a/morituri/common/program.py b/morituri/common/program.py
15index d340fdd..15cb751 100644
16--- a/morituri/common/program.py
17+++ b/morituri/common/program.py
18@@ -92,13 +92,13 @@ class Program(log.Loggable):
19 """
20 Load the given device.
21 """
22- os.system('eject -t %s' % device)
23+ os.system('@utillinux@/bin/eject -t %s' % device)
24
25 def ejectDevice(self, device):
26 """
27 Eject the given device.
28 """
29- os.system('eject %s' % device)
30+ os.system('@utillinux@/bin/eject %s' % device)
31
32 def unmountDevice(self, device):
33 """
34@@ -112,7 +112,7 @@ class Program(log.Loggable):
35 proc = open('/proc/mounts').read()
36 if device in proc:
37 print 'Device %s is mounted, unmounting' % device
38- os.system('umount %s' % device)
39+ os.system('@utillinux@/bin/umount %s' % device)
40
41 def getFastToc(self, runner, toc_pickle, device):
42 """
43Submodule morituri/extern/python-command contains modified content
44diff --git a/morituri/program/cdparanoia.py b/morituri/program/cdparanoia.py
45index 46176d5..fce14a5 100644
46--- a/morituri/program/cdparanoia.py
47+++ b/morituri/program/cdparanoia.py
48@@ -278,7 +278,7 @@ class ReadTrackTask(log.Loggable, task.Task):
49 stopTrack, stopOffset)
50
51 bufsize = 1024
52- argv = ["cdparanoia", "--stderr-progress",
53+ argv = ["@cdparanoia@/bin/cdparanoia", "--stderr-progress",
54 "--sample-offset=%d" % self._offset, ]
55 if self._device:
56 argv.extend(["--force-cdrom-device", self._device, ])
57@@ -551,7 +551,7 @@ _VERSION_RE = re.compile(
58
59 def getCdParanoiaVersion():
60 getter = common.VersionGetter('cdparanoia',
61- ["cdparanoia", "-V"],
62+ ["@cdparanoia@/bin/cdparanoia", "-V"],
63 _VERSION_RE,
64 "%(version)s %(release)s")
65
66diff --git a/morituri/program/cdrdao.py b/morituri/program/cdrdao.py
67index c6fba64..c4d0306 100644
68--- a/morituri/program/cdrdao.py
69+++ b/morituri/program/cdrdao.py
70@@ -257,7 +257,7 @@ class CDRDAOTask(ctask.PopenTask):
71
72 def start(self, runner):
73 self.debug('Starting cdrdao with options %r', self.options)
74- self.command = ['cdrdao', ] + self.options
75+ self.command = ['@cdrdao@/bin/cdrdao', ] + self.options
76
77 ctask.PopenTask.start(self, runner)
78
79@@ -515,7 +515,7 @@ _VERSION_RE = re.compile(
80
81 def getCDRDAOVersion():
82 getter = common.VersionGetter('cdrdao',
83- ["cdrdao"],
84+ ["@cdrdao@/bin/cdrdao"],
85 _VERSION_RE,
86 "%(version)s")
87