/stdhome

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

« back to all changes in this revision

Viewing changes to lib/stdhome/walker/copy_in.py

  • 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:
lib/stdhome/walker/copy_in.py
33
33
        Walker traversing:   repo
34
34
        """
35
35
 
36
 
        def __init__( self, walk_files = None ):
 
36
        def __init__( self, walk_files = None, report = False ):
37
37
                CopyBaseWalker.__init__( self )
38
38
                self.src_dir = the.full_home_dir
39
39
                self.dst_dir = the.repo.full_dir
40
40
                self.walk_list = walk_files if walk_files is not None else \
41
 
                                                 self.generate_walk_list()
 
41
                                                 self.generate_walk_list( the.repo.full_dir )
42
42
                self.check_src_symlinks = True
 
43
                self.report = report
43
44
 
44
45
 
45
46
        def print_op( self, rel_file, src, op, dst ):
46
47
 
 
48
                CopyBaseWalker.print_op( self, rel_file, src, op, dst )
 
49
 
47
50
                # verbose reporting
48
 
                if op == '*': op = '>'
49
51
                if the.verbose >= 2:
 
52
                        if op == '*': op = '>'
50
53
                        print "  %s%s%s %s" % ( src, op, dst, rel_file )