particle-os/debian-koji
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

never make backups of files that are patched so they don't end up in source jars

Browse source
This commit is contained in:
Mike Bonnet 2013-12-16 14:12:36 -05:00 • committed by Mike McLean
parent 1367cd73a0
commit 6f5212e78d
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
builder/kojid
View file

@ -1322,7 +1322,7 @@ class BuildMavenTask(BaseBuildTask):
raise koji.BuildError, 'no patches found at %s' % self.opts.get('patches')
patches.sort()
for patch in patches:
cmd = ['/usr/bin/patch', '--verbose', '-d', sourcedir, '-p1', '-i', os.path.join(patchcheckoutdir, patch)]
cmd = ['/usr/bin/patch', '--verbose', '--no-backup-if-mismatch', '-d', sourcedir, '-p1', '-i', os.path.join(patchcheckoutdir, patch)]
ret = log_output(self.session, cmd[0], cmd, patchlog, uploadpath, logerror=1, append=1)
if ret:
raise koji.BuildError, 'error applying patches from %s, see patches.log for details' % self.opts.get('patches')