/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_out.py

  • Committer: Tim Marston
  • Date: 2016-02-13 14:18:32 UTC
  • Revision ID: tim@ed.am-20160213141832-o0odt4p3nuj97211
switched init command (and update command) to checking for conflicts prior to
deployment.copy_out(), and removed remaining references to CopyInConflict
(supposedly done in r24)

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/stdhome/walker/copy_out.py
38
38
                                                        that no longer exists in the repo
39
39
        """
40
40
 
41
 
        def __init__( self, walk_files = None, report = True ):
 
41
        def __init__( self, walk_files = None ):
42
42
                CopyBaseWalker.__init__( self )
43
43
                self.src_dir = the.repo.full_dir
44
44
                self.dst_dir = the.full_home_dir
45
45
                self.walk_list = walk_files if walk_files is not None else \
46
 
                                                 self.generate_walk_list( the.repo.full_dir )
 
46
                                                 self.generate_walk_list()
47
47
                self.check_dst_symlinks = True
48
48
                self.check_dst_ignores = True
49
 
                self.report = report
50
 
 
51
 
 
52
 
        def print_op( self, rel_file, src, op, dst ):
53
 
 
54
 
                CopyBaseWalker.print_op( self, rel_file, src, op, dst )
55
 
 
56
 
                # verbose reporting
57
 
                if the.verbose >= 2:
58
 
                        if op == '*': op = '<'
59
 
                        print "  %s%s%s %s" % ( src, op, dst, rel_file )
 
49
 
 
50
 
 
51
        def print_op( self, rel_file, operation ):
 
52
                operation = re.sub( r'(.)(.)(.)', r'\3\2\1', operation )
 
53
                operation = re.sub( r'\>', r'<', operation )
 
54
                print "  %s %s" % ( operation, rel_file )