sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 09:49:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Ignore patchfiles ending with .orig' and .rej'.

Browse source
This commit is contained in:
Maxim Sobolev 2002-01-04 14:50:57 +00:00
parent 5d9acace80
commit 025beb219e
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=52567
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Tools/scripts/patchtool.py
View file

@ -37,6 +37,7 @@ class Vars:
DIFF_ARGS = '-du' DIFF_ARGS = '-du'
DIFF_SUFX = '.orig' DIFF_SUFX = '.orig'
PATCH_PREFIX = 'patch-' PATCH_PREFIX = 'patch-'
PATCH_IGN_SUFX = ('.orig', '.rej')
RCSDIFF_SUFX = ',v' RCSDIFF_SUFX = ',v'
CD_CMD = 'cd' CD_CMD = 'cd'
@ -433,7 +434,12 @@ class PatchesCollection:
# Not reached # # Not reached #
for file in glob.glob(os.path.join(patchdir, Vars.PATCH_PREFIX + '*')): for file in glob.glob(os.path.join(patchdir, Vars.PATCH_PREFIX + '*')):
self.addpatchfile(file, wrksrc) for sufx in Vars.PATCH_IGN_SUFX:
if file[-len(sufx):] == sufx:
write_msg('WARNING: patchfile "%s" ignored\n' % file)
break
else:
self.addpatchfile(file, wrksrc)
def addpatchfile(self, path, wrksrc): def addpatchfile(self, path, wrksrc):
path = os.path.abspath(path) path = os.path.abspath(path)