Author: duncan
Date: Mon Dec 4 16:31:23 2006
New Revision: 8698
Modified:
branches/rel-1/freevo/src/main.py
Log:
Corrected version check for kaa.metadata and added version check for kaa.imlib2
Modified: branches/rel-1/freevo/src/main.py
==============================================================================
--- branches/rel-1/freevo/src/main.py (original)
+++ branches/rel-1/freevo/src/main.py Mon Dec 4 16:31:23 2006
@@ -50,24 +50,14 @@
from xml.dom import minidom
# now load other modules to check if all requirements are installed
- import Image
import pygame
import twisted
import Numeric
import config
- if not config.CONF.lsdvd:
- print
- print 'Can\'t find lsdvd. DVD support will be limited and maybe not'
- print 'all discs are detected. Please install lsdvd, you can get it'
- print 'from http://acidrip.thirtythreeandathird.net/lsdvd.html'
- print
- print 'After installing it, you should run \'freevo cache --rebuild\''
- else:
- os.environ['LSDVD'] = config.CONF.lsdvd
-
import kaa.metadata as mmpython
+ import kaa.imlib2 as Image
except ImportError, i:
@@ -79,38 +69,34 @@
print 'Not all requirements of Freevo are installed on your system.'
print 'Please check the INSTALL file for more informations.'
print
- #
- # XXX: we need a new runtime :-)
- #
- # print 'A quick solution is to install the Freevo runtime. This contains'
- # print 'all Python dependencies to run Freevo. Get the current runtime at'
- # print
'http://sourceforge.net/project/showfiles.php?group_id=46652&release_id=194955'
- # print 'After downloading, run \'./freevo install path-to-runtime.tgz\'.'
- # print
- # print 'The runtime doesn\'t contain external applications like mplayer,
xine'
- # print 'or tvtime. You need to download and install them, too (all except'
- # print 'mplayer are optional).'
- # print
sys.exit(0)
-# check if mmpython is up to date to avoid bug reports
+# check if kaa.metadata is up to date to avoid bug reports
# for already fixed bugs
try:
- import mmpython.version
- if mmpython.version.VERSION < 20040629:
+ import kaa.metadata.version
+ if kaa.metadata.version.VERSION < 0.5:
raise ImportError
except ImportError:
- print 'Error: Installed mmpython version is too old.'
- print 'Please update mmpython to version 0.4.3 or higher'
+ print 'Error: Installed kaa.metadata version is too old.'
+ print 'Please update kaa.metadata to version 0.5 or higher or get it with
subversion'
+ print 'svn export svn://svn.freevo.org/kaa/trunk/metadata kaa/metadata'
print
sys.exit(0)
-
-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'
+
+# check if kaa.imlib2 is up to date to avoid bug reports
+# for already fixed bugs
+try:
+ import kaa.imlib2.version
+ if kaa.imlib2.version.VERSION < 0.1:
+ raise ImportError
+except ImportError:
+ print 'Error: Installed kaa.imlib2 version is too old.'
+ print 'Please update kaa.imlib2 to version 0.1 or higher or get it with
subversion'
+ print 'svn export svn://svn.freevo.org/kaa/trunk/imlib2 kaa/imlib2'
print
+ sys.exit(0)
import util # Various utilities
import osd # The OSD class, used to communicate with the OSD daemon
@@ -202,7 +188,6 @@
-
class Splashscreen(skin.Area):
"""
A simple splash screen for osd startup
@@ -244,7 +229,6 @@
-
class MainTread:
"""
The main thread or loop of freevo
@@ -339,7 +323,6 @@
-
def signal_handler(sig, frame):
"""
the signal handler to shut down freevo
@@ -348,7 +331,6 @@
shutdown(exit=True)
-
def tracefunc(frame, event, arg, _indent=[0]):
"""
function to trace everything inside freevo for debugging
@@ -375,7 +357,6 @@
-
#
# Freevo main function
#
@@ -421,7 +402,6 @@
shutdown(exit=True)
-
try:
# signal handler
signal.signal(signal.SIGTERM, signal_handler)
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
