diff options
author | Maxim Sobolev <sobomax@FreeBSD.org> | 2002-04-15 21:04:58 +0000 |
---|---|---|
committer | Maxim Sobolev <sobomax@FreeBSD.org> | 2002-04-15 21:04:58 +0000 |
commit | ede6fd9daec1adf03763927dce4bbe1000b21349 (patch) | |
tree | 9d930888aa9bd5ebb7146a3b6392f19345e9bf76 /Tools/scripts | |
parent | Update to 1.0.6. (diff) |
Recognise EXTRA_PATCHES.
Notes
Notes:
svn path=/head/; revision=57733
Diffstat (limited to 'Tools/scripts')
-rwxr-xr-x | Tools/scripts/patchtool.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Tools/scripts/patchtool.py b/Tools/scripts/patchtool.py index b830f5c74c81..8ae9ba0e75d2 100755 --- a/Tools/scripts/patchtool.py +++ b/Tools/scripts/patchtool.py @@ -269,6 +269,7 @@ def query_yn(message, default = False): elif reply == '' and default in (True, False): return default print 'Wrong answer "%s", please try again' % reply + return default # @@ -557,6 +558,11 @@ def generate(args, automatic, force, ignoremtime): if os.path.isdir(patchdir): patches.adddir(patchdir, wrksrc) + extra_patches = querymakevar('EXTRA_PATCHES', portdir, True) + for extra_patch in extra_patches.split(): + if os.path.isfile(extra_patch): + patches.addpatchfile(extra_patch, wrksrc) + patchobj = patches.lookupbytarget(wrksrc, relpath) if patchobj == None: patchobj = NewPatch(patchdir, wrksrc, relpath) |