pyrox.dev
1diff -Nurp morituri-0.2.3-orig/doc/Makefile.in morituri-0.2.3/doc/Makefile.in
2--- morituri-0.2.3-orig/doc/Makefile.in 2014-12-23 12:44:46.222410092 +0100
3+++ morituri-0.2.3/doc/Makefile.in 2014-12-23 12:46:49.619756940 +0100
4@@ -486,7 +486,7 @@ morituri.ics: $(top_srcdir)/morituri.doa
5 -moap doap -f $(top_srcdir)/morituri.doap ical > morituri.ics
6
7 rip.1: $(top_srcdir)/morituri/extern/python-command/scripts/help2man $(top_srcdir)/morituri
8- PYTHONPATH=$(top_srcdir) $(PYTHON) $(top_srcdir)/morituri/extern/python-command/scripts/help2man morituri.rip.main.Rip rip > rip.1
9+ PYTHONPATH=$(top_srcdir):$(PYTHONPATH) $(PYTHON) $(top_srcdir)/morituri/extern/python-command/scripts/help2man morituri.rip.main.Rip rip > rip.1
10
11 clean-local:
12 @rm -rf reference
13diff -Nurp morituri-0.2.3-orig/morituri/common/program.py morituri-0.2.3/morituri/common/program.py
14--- morituri-0.2.3-orig/morituri/common/program.py 2014-12-23 12:44:46.218410048 +0100
15+++ morituri-0.2.3/morituri/common/program.py 2014-12-23 12:46:49.647757245 +0100
16@@ -92,13 +92,13 @@ class Program(log.Loggable):
17 """
18 Load the given device.
19 """
20- os.system('eject -t %s' % device)
21+ os.system('@utillinux@/bin/eject -t %s' % device)
22
23 def ejectDevice(self, device):
24 """
25 Eject the given device.
26 """
27- os.system('eject %s' % device)
28+ os.system('@utillinux@/bin/eject %s' % device)
29
30 def unmountDevice(self, device):
31 """
32@@ -112,7 +112,7 @@ class Program(log.Loggable):
33 proc = open('/proc/mounts').read()
34 if device in proc:
35 print 'Device %s is mounted, unmounting' % device
36- os.system('umount %s' % device)
37+ os.system('@utillinux@/bin/umount %s' % device)
38
39 def getFastToc(self, runner, toc_pickle, device):
40 """
41diff -Nurp morituri-0.2.3-orig/morituri/extern/python-command/scripts/help2man morituri-0.2.3/morituri/extern/python-command/scripts/help2man
42--- morituri-0.2.3-orig/morituri/extern/python-command/scripts/help2man 2014-12-23 12:44:46.206409916 +0100
43+++ morituri-0.2.3/morituri/extern/python-command/scripts/help2man 2014-12-23 12:46:49.631757074 +0100
44@@ -1,4 +1,4 @@
45-#!/usr/bin/python
46+#!@python@/bin/python
47
48 # -*- Mode: Python -*-
49 # vi:si:et:sw=4:sts=4:ts=4
50diff -Nurp morituri-0.2.3-orig/morituri/program/cdparanoia.py morituri-0.2.3/morituri/program/cdparanoia.py
51--- morituri-0.2.3-orig/morituri/program/cdparanoia.py 2014-12-23 12:44:46.202409873 +0100
52+++ morituri-0.2.3/morituri/program/cdparanoia.py 2014-12-23 12:46:49.659757376 +0100
53@@ -278,7 +278,7 @@ class ReadTrackTask(log.Loggable, task.T
54 stopTrack, stopOffset)
55
56 bufsize = 1024
57- argv = ["cdparanoia", "--stderr-progress",
58+ argv = ["@cdparanoia@/bin/cdparanoia", "--stderr-progress",
59 "--sample-offset=%d" % self._offset, ]
60 if self._device:
61 argv.extend(["--force-cdrom-device", self._device, ])
62@@ -551,7 +551,7 @@ _VERSION_RE = re.compile(
63
64 def getCdParanoiaVersion():
65 getter = common.VersionGetter('cdparanoia',
66- ["cdparanoia", "-V"],
67+ ["@cdparanoia@/bin/cdparanoia", "-V"],
68 _VERSION_RE,
69 "%(version)s %(release)s")
70
71diff -Nurp morituri-0.2.3-orig/morituri/program/cdrdao.py morituri-0.2.3/morituri/program/cdrdao.py
72--- morituri-0.2.3-orig/morituri/program/cdrdao.py 2014-12-23 12:44:46.202409873 +0100
73+++ morituri-0.2.3/morituri/program/cdrdao.py 2014-12-23 12:46:49.667757463 +0100
74@@ -257,7 +257,7 @@ class CDRDAOTask(ctask.PopenTask):
75
76 def start(self, runner):
77 self.debug('Starting cdrdao with options %r', self.options)
78- self.command = ['cdrdao', ] + self.options
79+ self.command = ['@cdrdao@/bin/cdrdao', ] + self.options
80
81 ctask.PopenTask.start(self, runner)
82
83@@ -515,7 +515,7 @@ _VERSION_RE = re.compile(
84
85 def getCDRDAOVersion():
86 getter = common.VersionGetter('cdrdao',
87- ["cdrdao"],
88+ ["@cdrdao@/bin/cdrdao"],
89 _VERSION_RE,
90 "%(version)s")
91