Update of /cvsroot/freevo/freevo/src
In directory sc8-pr-cvs1:/tmp/cvs-serv21229
Modified Files:
config.py
Log Message:
o use FREEVO_HOME if defined to find freevo_config.py
o check if main is called. If not be very quite and don't log to file
Index: config.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/config.py,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** config.py 1 Aug 2003 17:54:05 -0000 1.34
--- config.py 4 Aug 2003 18:36:49 -0000 1.35
***************
*** 23,26 ****
--- 23,30 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.35 2003/08/04 18:36:49 dischi
+ # o use FREEVO_HOME if defined to find freevo_config.py
+ # o check if main is called. If not be very quite and don't log to file
+ #
# Revision 1.34 2003/08/01 17:54:05 dischi
# xine support and cleanups.
***************
*** 98,101 ****
--- 102,111 ----
import setup_freevo
+ if sys.argv[0].find('src/main.py') == -1:
+ HELPER=1
+ else:
+ HELPER=0
+
+
if not 'FREEVO_STARTDIR' in os.environ:
print 'WARNING: FREEVO_STARTDIR is not set!'
***************
*** 172,178 ****
# Redirect stdout and stderr to stdout and /tmp/freevo.log
#
!
! sys.stdout = Logger(sys.argv[0] + ':stdin')
! sys.stderr = Logger(sys.argv[0] + ':stderr')
--- 182,188 ----
# Redirect stdout and stderr to stdout and /tmp/freevo.log
#
! if not HELPER:
! sys.stdout = Logger(sys.argv[0] + ':stdin')
! sys.stderr = Logger(sys.argv[0] + ':stderr')
***************
*** 260,268 ****
# Load freevo_config.py:
! cfgfilename = './freevo_config.py'
if os.path.isfile(cfgfilename):
if DEBUG: print 'Loading cfg: %s' % cfgfilename
execfile(cfgfilename, globals(), locals())
!
else:
print "\nERROR: can't find freevo_config.py"
--- 270,282 ----
# Load freevo_config.py:
! if os.environ.has_key('FREEVO_HOME'):
! cfgfilename = os.path.join(os.environ['FREEVO_HOME'], 'freevo_config.py')
! else:
! cfgfilename = './freevo_config.py'
!
if os.path.isfile(cfgfilename):
if DEBUG: print 'Loading cfg: %s' % cfgfilename
execfile(cfgfilename, globals(), locals())
!
else:
print "\nERROR: can't find freevo_config.py"
***************
*** 352,357 ****
for rd_mntdir, rd_devname, rd_dispname in ROM_DRIVES:
if os.path.realpath(rd_devname) == os.path.realpath(devname):
! print (('ROM_DRIVES: Auto-detected that %s is the same ' +
! 'device as %s, skipping') % (devname, rd_devname))
break
else:
--- 366,372 ----
for rd_mntdir, rd_devname, rd_dispname in ROM_DRIVES:
if os.path.realpath(rd_devname) == os.path.realpath(devname):
! if not HELPER:
! print (('ROM_DRIVES: Auto-detected that %s is the same ' +
! 'device as %s, skipping') % (devname, rd_devname))
break
else:
***************
*** 359,363 ****
if mntdir and devname and dispname:
ROM_DRIVES += [ (mntdir, devname, dispname) ]
! print 'ROM_DRIVES: Auto-detected and added "%s"' %
(ROM_DRIVES[-1], )
fd_fstab.close()
--- 374,379 ----
if mntdir and devname and dispname:
ROM_DRIVES += [ (mntdir, devname, dispname) ]
! if not HELPER:
! print 'ROM_DRIVES: Auto-detected and added "%s"' %
(ROM_DRIVES[-1], )
fd_fstab.close()
-------------------------------------------------------
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa00100003ave/direct;at.aspnet_072303_01/01
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
