diff options
| author | wanchao-xu <wanchao.xu@samsung.com> | 2024-04-30 14:16:23 +0800 |
|---|---|---|
| committer | wanchao-xu <wanchao.xu@samsung.com> | 2024-04-30 14:16:23 +0800 |
| commit | dc84e29ad505fba337091b28705d52dc8bdd17a2 (patch) | |
| tree | 746eb2c68de1fee72c334091f127a84d04b48d50 | |
| parent | 5b07dc2d4c7395f9a869d9677b8a5d654640cad6 (diff) | |
| download | git-buildpackage-dc84e29ad505fba337091b28705d52dc8bdd17a2.tar.gz git-buildpackage-dc84e29ad505fba337091b28705d52dc8bdd17a2.tar.bz2 git-buildpackage-dc84e29ad505fba337091b28705d52dc8bdd17a2.zip | |
pq-rpm: fix the mistake of generate_patches.sandbox/xuwc/gbp_0.9.29
Change-Id: Ieaa9f6e3c9a063a50c25d623e1fe76f0c1926815
Signed-off-by: wanchao-xu <wanchao.xu@samsung.com>
| -rwxr-xr-x | gbp/scripts/pq_rpm.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gbp/scripts/pq_rpm.py b/gbp/scripts/pq_rpm.py index 95c60b66..445540b3 100755 --- a/gbp/scripts/pq_rpm.py +++ b/gbp/scripts/pq_rpm.py @@ -89,11 +89,12 @@ def generate_patches(repo, start, squash, end, outdir, options): start_sha1 = repo.rev_parse("%s^0" % start) try: end_commit = end + end_commit_sha1 = repo.rev_parse("%s^0" % end_commit) except GitRepositoryError: # In case of plain tree-ish objects, assume current branch head is the # last commit end_commit = "HEAD" - end_commit_sha1 = repo.rev_parse("%s^0" % end_commit) + end_commit_sha1 = repo.rev_parse("%s^0" % end_commit) start_sha1 = repo.rev_parse("%s^0" % start) @@ -157,8 +158,8 @@ def generate_patches(repo, start, squash, end, outdir, options): if end_commit != end: gbp.log.info("Generating diff file %s..%s" % (end_commit, end)) patch_fn = format_diff(outdir, None, repo, end_commit, end, - options.patch_export_ignore_path, - abbrev=options.abbrev) + abbrev=options.abbrev, + path_exclude_regex=options.patch_export_ignore_path) if patch_fn: patches.append(patch_fn) |