/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: 2016-12-13 21:40:34 UTC
  • Revision ID: tim@ed.am-20161213214034-nd5t7ztnlrjd627i
fix add command and generic filename expansion/resolution to expend to
homedir-relative filename and absolute filename based on original filename, as
specified, rather than a fully, symlink-resolved filename.  So, e.g., if ~/bob
was a symlink to ~/fred, then ~/bob/a would resolve to the relative filename
bob/a, becuase it is inside the homedir (it would resolve to fred/a otherwise)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/stdhome.in
1
 
#!@PYTHON@
 
1
#!/usr/bin/python
2
2
#
3
3
# stdhome
4
4
#
26
26
if __name__ == "__main__":
27
27
 
28
28
        import sys
29
 
        from os.path import abspath, exists, join
30
 
 
31
 
        # add regular site-package directories (for debian)
32
 
        for path in sys.path:
33
 
                if path.endswith('dist-packages'):
34
 
                        sys.path.append( path[:-13] + 'site-packages' )
 
29
        from os.path import join, abspath, exists
35
30
 
36
31
        # check for a development source directory and use that if it's there
37
32
        PACKAGE_DIR = join( abspath( sys.path[ 0 ] ), "..", "lib" )
38
33
        if exists( join( PACKAGE_DIR, "stdhome", "the.py" ) ):
39
 
                print( "!!! using development packages !!!", file=sys.stderr )
 
34
                print >> sys.stderr, "!!! using development packages !!!"
40
35
                sys.path.insert( 0, PACKAGE_DIR )
41
36
        else:
42
37
                del PACKAGE_DIR