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

  • Committer: Tim Marston
  • Date: 2021-09-01 13:06:23 UTC
  • Revision ID: tim@ed.am-20210901130623-2yv2y02e3zwgd07y
fix newlines in resolve command

Show diffs side-by-side

added added

removed removed

lib/stdhome/command/resolve.py
19
19
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
20
20
 
21
21
 
22
 
import sys, re, getopt
23
 
from .command import Command
 
22
import getopt
 
23
import re
 
24
import sys
 
25
 
24
26
import stdhome.the as the
25
27
from stdhome.deployment import Deployment
26
28
 
 
29
from .command import Command
 
30
 
27
31
 
28
32
class ResolveCommand( Command ):
29
33
 
94
98
                # check for conflicts in repo
95
99
                files = the.repo.vcs.get_conflicts()
96
100
                if files:
97
 
                        message += 'conflicts in %s:\n  %s' % \
 
101
                        message += 'conflicts in %s:\n  %s\n' % \
98
102
                                           ( the.repo.name, '\n  '.join( files ) )
99
103
 
100
104
                # check for deployment conclicts
101
105
                conflicts = deployment.get_conflicts()
102
106
                if conflicts:
103
 
                        message += 'deployment conflicts:\n  %s' % \
 
107
                        message += 'deployment conflicts:\n  %s\n' % \
104
108
                                           '\n  '.join( conflicts )
105
109
 
106
110
                # stop if there are conflicts
107
111
                if message:
108
112
                        raise the.program.FatalError(
109
 
                                'there were conflicts...\n' + message )
 
113
                                'there were conflicts...\n' + message.rstrip( '\n' ) )
110
114
 
111
115
                # copy-out changes from repo
112
116
                deployment.copy_out( self.quiet )