On a slightly different register, check_program in setup_freevo.py has
still references to runtime, even if the runtime package is deprecated,
if I'm not mistaken.


For 1.5.x the runtime is deprecated but still works (more or
less). For Freevo cvs it doesn't even work anymore, so removing all
runtime reference is a good cleanup.


here's a patch that do that.

Regards,

Xavier

--- setup_freevo.py.orig	2005-05-18 11:04:24.000000000 +0200
+++ setup_freevo.py	2005-05-18 11:00:25.000000000 +0200
@@ -178,15 +178,9 @@
     print 'wrote %s' % outfile
 
 
-def check_program(conf, name, variable, necessary, sysfirst=1, verbose=1):
+def check_program(conf, name, variable, necessary, verbose=1):
 
-    # Check for programs both in the path and the runtime apps dir
-    search_dirs_runtime = ['./runtime/apps', './runtime/apps/mplayer',
-                           './runtime/apps/tvtime']
-    if sysfirst:
-        search_dirs = os.environ['PATH'].split(':') + search_dirs_runtime
-    else:
-        search_dirs = search_dirs_runtime + os.environ['PATH'].split(':')
+    search_dirs = os.environ['PATH'].split(':')
         
     if verbose:
         print _('checking for %-13s') % (name+'...'),
@@ -225,11 +219,10 @@
     conf.tv = 'ntsc'
     conf.chanlist = 'us-cable'
     conf.version = CONFIG_VERSION
-    sysfirst = 0 # Check the system path for apps first, then the runtime
     
     # Parse commandline options
     try:
-        long_opts = 'help compile= geometry= display= tv= chanlist= sysfirst'.split()
+        long_opts = 'help compile= geometry= display= tv= chanlist= '.split()
         opts, args = getopt.getopt(sys.argv[1:], 'h', long_opts)
     except getopt.GetoptError:
         # print help information and exit:
@@ -253,9 +246,6 @@
         if o == '--chanlist':
             conf.chanlist = a
 
-        if o == '--sysfirst':
-            sysfirst = 1
-
         # this is called by the Makefile, don't call it directly
         if o == '--compile':
             # Compile python files:
@@ -273,10 +263,8 @@
             sys.exit(0)
 
 
-    print _('System path first=%s') % ( [_('No'), _('Yes')][sysfirst])
-
     for program, valname, needed in EXTERNAL_PROGRAMS:
-        check_program(conf, program, valname, needed, sysfirst)
+        check_program(conf, program, valname, needed)
 
     check_config(conf)
 

Reply via email to