Update of /cvsroot/freevo/freevo/src/util
In directory sc8-pr-cvs1:/tmp/cvs-serv32483/src/util
Modified Files:
__init__.py fileops.py
Log Message:
Check for libs and make it possible to install runtime from within
freevo
Index: __init__.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/util/__init__.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** __init__.py 18 Oct 2003 13:04:42 -0000 1.2
--- __init__.py 2 Nov 2003 09:24:35 -0000 1.3
***************
*** 11,14 ****
--- 11,18 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.3 2003/11/02 09:24:35 dischi
+ # Check for libs and make it possible to install runtime from within
+ # freevo
+ #
# Revision 1.2 2003/10/18 13:04:42 dischi
# add distutils
***************
*** 45,49 ****
# with util in only one file
! if sys.argv[0].find('setup.py') == -1:
from misc import *
from fileops import *
--- 49,54 ----
# with util in only one file
! if sys.argv[0].find('setup.py') == -1 and sys.argv[0].find('install.py') == -1:
! print sys.argv[0]
from misc import *
from fileops import *
Index: fileops.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/util/fileops.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** fileops.py 17 Oct 2003 17:28:41 -0000 1.2
--- fileops.py 2 Nov 2003 09:24:35 -0000 1.3
***************
*** 11,14 ****
--- 11,18 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.3 2003/11/02 09:24:35 dischi
+ # Check for libs and make it possible to install runtime from within
+ # freevo
+ #
# Revision 1.2 2003/10/17 17:28:41 dischi
# bugfix
***************
*** 47,51 ****
import cPickle, pickle # pickle because sometimes cPickle doesn't work
import fnmatch
! import misc
if float(sys.version[0:3]) < 2.3:
--- 51,55 ----
import cPickle, pickle # pickle because sometimes cPickle doesn't work
import fnmatch
! import traceback
if float(sys.version[0:3]) < 2.3:
***************
*** 54,60 ****
PICKLE_PROTOCOL = pickle.HIGHEST_PROTOCOL
! # Configuration file. Determines where to look for AVI/MP3 files, etc
! import config
--- 58,70 ----
PICKLE_PROTOCOL = pickle.HIGHEST_PROTOCOL
+ for t in traceback.extract_stack():
+ if t[0][0].find('install.py'):
+ break
+ else:
+ # Configuration file. Determines where to look for AVI/MP3 files, etc
+ import config
! # import stuff from util.misc
! import misc
-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive? Does it
help you create better code? SHARE THE LOVE, and help us help
YOU! Click Here: http://sourceforge.net/donate/
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
