aboutsummaryrefslogtreecommitdiff
path: root/gbp/scripts/import_dsc.py
diff options
context:
space:
mode:
authorGuido G√ľnther <agx@sigxcpu.org>2016-07-05 12:25:32 +0200
committerGuido G√ľnther <agx@sigxcpu.org>2016-07-05 13:52:32 +0200
commit3a5a497c9e42b0167baa8847fc8a9f09cc111ceb (patch)
tree5d06130cc864000fa952e403ce81344197da0f0b /gbp/scripts/import_dsc.py
parentd7b62d1dcef81e2bb9264dfb3871736993d9ac78 (diff)
import_dsc: Use the same patch options as dpkg-source for 1.0 packages
(except for creating backup files) Closes: #670099
Diffstat (limited to 'gbp/scripts/import_dsc.py')
-rw-r--r--gbp/scripts/import_dsc.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/gbp/scripts/import_dsc.py b/gbp/scripts/import_dsc.py
index 78a30ee..b0770c3 100644
--- a/gbp/scripts/import_dsc.py
+++ b/gbp/scripts/import_dsc.py
@@ -64,9 +64,14 @@ def download_source(pkg, dirs, unauth):
def apply_patch(diff):
"Apply patch to a source tree"
+ patch_opts = ['-N', '-p1', '-F0', '-u', '-t',
+ '-Vnever', '-g0', '-z.gbp.orig',
+ '--quiet']
+
pipe = pipes.Template()
pipe.prepend('gunzip -c %s' % diff, '.-')
- pipe.append('patch -p1 --quiet', '-.')
+ pipe.append('patch %s' % ' '.join(patch_opts), '-.')
+
try:
ret = pipe.copy('', '')
if ret: