Author: dmeyer
Date: Sun Oct 15 18:15:09 2006
New Revision: 8382

Modified:
   trunk/ui/bin/freevo
   trunk/ui/src/config/setup.py

Log:
make freevo setup work again

Modified: trunk/ui/bin/freevo
==============================================================================
--- trunk/ui/bin/freevo (original)
+++ trunk/ui/bin/freevo Sun Oct 15 18:15:09 2006
@@ -76,6 +76,12 @@
     print
     sys.exit(1)
 
+if len(sys.argv) >= 2 and sys.argv[1] in ('setup'):
+
+    # XXX setup call, remove me
+    sys.path.insert(0, __site__ + '/freevo/ui/config')
+    import setup
+    setup.run_as_main()
 
 try:
     # i18n support

Modified: trunk/ui/src/config/setup.py
==============================================================================
--- trunk/ui/src/config/setup.py        (original)
+++ trunk/ui/src/config/setup.py        Sun Oct 15 18:15:09 2006
@@ -204,7 +204,7 @@
 
 
 
-if __name__ == '__main__':
+def run_as_main():
     # Default opts
 
     # XXX Make this OO and also use the Optik lib
@@ -214,11 +214,11 @@
     conf.tv = 'ntsc'
     conf.chanlist = 'us-cable'
     conf.version = CONFIG_VERSION
-    
+
     # Parse commandline options
     try:
         long_opts = 'help compile= geometry= display= tv= chanlist= '.split()
-        opts, args = getopt.getopt(sys.argv[1:], 'h', long_opts)
+        opts, args = getopt.getopt(sys.argv[2:], 'h', long_opts)
     except getopt.GetoptError:
         # print help information and exit:
         print_usage()

-------------------------------------------------------------------------
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

Reply via email to