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

  • Committer: Tim Marston
  • Date: 2014-02-26 19:15:30 UTC
  • Revision ID: tim@ed.am-20140226191530-6x21vlwto2xx80cd
renamed updated_files to affected_files

Show diffs side-by-side

added added

removed removed

lib/stdhome/walker/conflict_walker.py
27
27
        """The conflict walker traverses the repo looking for "deployment conflicts"
28
28
        (i.e., changes in the type of file).  This is run prior to running the
29
29
        copy-out walker and, as such, is given a list of files that were copied-in
30
 
        and which is can, therefore, safely ignore.
 
30
        and which is can, therefore, safely ignore.  It can also be given a list of
 
31
        files affected by the update (it will walk all repo files otherwise).
31
32
 
32
33
        Walker source:       repo
33
34
        Walker destination:  home dir
34
35
        Walker traversing:   repo
35
36
        """
36
37
 
37
 
        def __init__( self, ignore_files, updated_files = None ):
 
38
        def __init__( self, ignore_files, affected_files = None ):
38
39
                self.src_dir = the.repo.full_dir
39
40
                self.dst_dir = the.full_fsdir
40
 
                self.walk_list = updated_files if updated_files is not None else \
 
41
                self.walk_list = affected_files if affected_files is not None else \
41
42
                                                 self.generate_walk_list( the.repo.full_dir )
42
43
 
43
44
                self.ignore_files = ignore_files