Author: duncan
Date: Wed Aug 1 14:59:46 2007
New Revision: 9801
Log:
Tidies up some debugging messages
Modified:
branches/rel-1/freevo/src/config.py
branches/rel-1/freevo/src/rc.py
Modified: branches/rel-1/freevo/src/config.py
==============================================================================
--- branches/rel-1/freevo/src/config.py (original)
+++ branches/rel-1/freevo/src/config.py Wed Aug 1 14:59:46 2007
@@ -413,8 +413,9 @@
#
for dirname in cfgfilepath:
freevoconf = dirname + '/freevo.conf'
+ _debug_('Trying freevo configuration file "%s"...' % freevoconf)
if os.path.isfile(freevoconf):
- _debug_('Loading configure settings: %s' % freevoconf)
+ _debug_('Loading freevo configuration file "%s"' % freevoconf, DINFO)
commentpat = re.compile('([^#]*)( *#.*)')
c = open(freevoconf)
@@ -540,8 +541,9 @@
#
for dirname in cfgfilepath:
overridefile = dirname + '/local_conf.py'
+ _debug_('Trying local configuration file "%s"...' % overridefile)
if os.path.isfile(overridefile):
- _debug_('Loading cfg overrides: %s' % overridefile, DINFO)
+ _debug_('Loading local configuration file "%s"' % overridefile, DINFO)
execfile(overridefile, globals(), locals())
try:
@@ -744,7 +746,7 @@
elif devname.lower().find('dvd') != -1:
dispname = 'DVD-%s' % (len(ROM_DRIVES)+1)
elif devname.lower().find('hd') != -1:
- print 'Trying to autodetect type of %s' %devname
+ print 'Trying to autodetect type of %s' % devname
if os.path.exists('/proc/ide/' + re.sub(r'^(/dev/)', '',
devname) + '/media'):
if open('/proc/ide/'+ re.sub(r'^(/dev/)', '',
devname) +\
'/media','r').read().lower().find('cdrom') !=1:
@@ -787,7 +789,6 @@
#
REMOVABLE_MEDIA = []
-
#
# Auto detect xmltv channel list
#
@@ -976,7 +977,7 @@
_debug_( "Using '%s' encoding" % encoding )
for k,v in CONF.__dict__.items():
- _debug_('%r: %r' % (k, v), 1)
+ _debug_('%r: %r' % (k, v))
# make sure USER and HOME are set
os.environ['USER'] = pwd.getpwuid(os.getuid())[0]
Modified: branches/rel-1/freevo/src/rc.py
==============================================================================
--- branches/rel-1/freevo/src/rc.py (original)
+++ branches/rel-1/freevo/src/rc.py Wed Aug 1 14:59:46 2007
@@ -187,7 +187,7 @@
"""
(re-)initialize pylirc, e.g. after calling close()
"""
- print 'PyLirc resumed!'
+ _debug_('PyLirc resumed!')
pylirc.init('freevo', config.LIRCRC)
pylirc.blocking(0)
@@ -196,7 +196,7 @@
"""
cleanup pylirc, close devices
"""
- print 'PyLirc suspended!'
+ _debug_('PyLirc suspended!')
pylirc.exit()
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
