/stdhome

To get this branch, use:
bzr branch http://bzr.ed.am/stdhome

« back to all changes in this revision

Viewing changes to src/stdhome.in

  • Committer: Tim Marston
  • Date: 2014-03-08 00:47:23 UTC
  • Revision ID: tim@ed.am-20140308004723-hkl3s2hobsblf72o
added diff command; moved all command to commands subdir; made stage-revert
handle ongoing deployment automatically (now that initial revno is known); made
verbose level incremental; detect obstructing conflicts in ConflictWalker;
handle files deleted from repo during copy-out (update)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/stdhome.in
31
31
 
32
32
        # check for a development source directory and use that if it's there
33
33
        PACKAGE_DIR = join( abspath( sys.path[ 0 ] ), "..", "lib" )
34
 
        if exists( join( PACKAGE_DIR, "stdhome", "stdhome.py" ) ):
 
34
        if exists( join( PACKAGE_DIR, "stdhome", "the.py" ) ):
35
35
                print >> sys.stderr, "!!! using development packages !!!"
36
36
                sys.path.insert( 0, PACKAGE_DIR )
37
37
        else:
38
38
                del PACKAGE_DIR
39
39
 
40
40
        # start main program
41
 
        from stdhome.stdhome import *
42
 
        Stdhome( "@PACKAGE_VERSION@" ).run()
 
41
        from stdhome import the
 
42
        from stdhome.program import Program
 
43
        the.program = Program( "@PACKAGE_VERSION@" )
 
44
        the.program.run()