Author: duncan
Date: Sun Oct 22 13:33:16 2006
New Revision: 8452
Modified:
branches/rel-1/freevo/src/helpers/cache.py
branches/rel-1/freevo/src/main.py
branches/rel-1/freevo/src/util/mediainfo.py
Log:
Some changes due to the differences between kaa.metadata and mmpython
Modified: branches/rel-1/freevo/src/helpers/cache.py
==============================================================================
--- branches/rel-1/freevo/src/helpers/cache.py (original)
+++ branches/rel-1/freevo/src/helpers/cache.py Sun Oct 22 13:33:16 2006
@@ -218,7 +218,7 @@
fxd += util.match_files_recursively(dir[1],
fxditem.mimetype.suffix())
elif isinstance(dir, list) or isinstance(dir, tuple):
print
- print 'bad path: %s ' % dir[1] ,
+ print 'bad path: %s ' % dir[1],
sys.__stdout__.flush()
elif util.match_suffix(dir, playlist.mimetype.suffix()):
pl.append(dir)
Modified: branches/rel-1/freevo/src/main.py
==============================================================================
--- branches/rel-1/freevo/src/main.py (original)
+++ branches/rel-1/freevo/src/main.py Sun Oct 22 13:33:16 2006
@@ -98,7 +98,7 @@
# for already fixed bugs
try:
import mmpython.version
- if mmpython.version.CHANGED < 20040629:
+ if mmpython.version.VERSION < 20040629:
raise ImportError
except ImportError:
print 'Error: Installed mmpython version is too old.'
@@ -106,7 +106,7 @@
print
sys.exit(0)
-if mmpython.version.CHANGED < 20060926:
+if mmpython.version.VERSION < 20060926:
print 'Warning: Installed mmpython version is old.'
print 'Please update mmpython to version 0.4.10 or higher, get it with
subversion'
print 'svn export svn://svn.freevo.org/kaa/branches/mmpython-0-4/mmpython
mmpython-0.4.10'
Modified: branches/rel-1/freevo/src/util/mediainfo.py
==============================================================================
--- branches/rel-1/freevo/src/util/mediainfo.py (original)
+++ branches/rel-1/freevo/src/util/mediainfo.py Sun Oct 22 13:33:16 2006
@@ -673,7 +673,7 @@
for f in util.match_files(config.OVERLAY_DIR + '/disc/metadata',
['mmpython']):
os.unlink(f)
cachefile = os.path.join(config.FREEVO_CACHEDIR, 'mediainfo')
- util.save_pickle((mmpython.version.CHANGED, 0, 0, 0), cachefile)
+ util.save_pickle((mmpython.version.VERSION, 0, 0, 0), cachefile)
__last_status_check__ = 0
@@ -774,7 +774,7 @@
print
del_cache()
- elif mmpython.version.CHANGED > mmchanged:
+ elif mmpython.version.VERSION > mmchanged:
print
print 'Warning: mmpython as changed.'
print 'Please rerun \'freevo cache\' to get the latest updates'
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
