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

lib/stdhome/walker/copy_in.py
21
21
 
22
22
from copy_base import CopyBaseWalker
23
23
import stdhome.the as the
 
24
from stdhome.file_matcher import FileMatcher
24
25
 
25
26
 
26
27
class CopyInWalker( CopyBaseWalker ):
32
33
        Walker traversing:   repo
33
34
        """
34
35
 
35
 
        def __init__( self ):
 
36
        def __init__( self, walk_files = None ):
 
37
                CopyBaseWalker.__init__( self )
36
38
                self.src_dir = the.full_home_dir
37
39
                self.dst_dir = the.repo.full_dir
38
 
                self.walk_list = self.generate_walk_list( the.repo.full_dir )
39
 
 
40
 
                self.changed = list()
 
40
                self.walk_list = walk_files if walk_files is not None else \
 
41
                                                 self.generate_walk_list()
 
42
                self.check_src_symlinks = True
41
43
 
42
44
 
43
45
        def print_op( self, rel_file, operation ):