/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/command/status.py

  • Committer: Tim Marston
  • Date: 2014-04-18 14:42:00 UTC
  • Revision ID: tim@ed.am-20140418144200-ksbr3l58p2v3jhy2
fixed bugs in command.expand_files, where results could be not unique, nor
sorted, and make sure the last component of the files is not resolved if it is a
symlink

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/stdhome/command/status.py
84
84
                # initialise deployment and check if it's ongoing
85
85
                deployment = Deployment()
86
86
                if deployment.is_ongoing():
 
87
                        print "deployment ongoing"
87
88
 
88
89
                        # check for conflicts in repo
89
90
                        files = the.repo.vcs.get_conflicts()