From ea99624728f27db0fd234f88b3184eaaa883ca46 Mon Sep 17 00:00:00 2001
From: Ritesh Raj Sarraf <ritesh.sarraf@collabora.com>
Date: Wed, 10 Mar 2021 21:24:44 +0530
Subject: [PATCH] Add the missing type specifier
Without it, the generated changelog was wrong like below:
```
node-accepts (1.3.7-1{local_suffix}0) apertis; urgency=medium
* Sync from Debian debian/bullseye.
-- Apertis CI <devel@lists.apertis.org> Wed, 10 Mar 2021 14:56:51 +0000
```
Signed-off-by: Ritesh Raj Sarraf <ritesh.sarraf@collabora.com>
---
.../overlay/usr/bin/apertis-pkg-merge-upstream-to-downstreams | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package-source-builder/overlay/usr/bin/apertis-pkg-merge-upstream-to-downstreams b/package-source-builder/overlay/usr/bin/apertis-pkg-merge-upstream-to-downstreams
index 29eef00..d7c928c 100755
--- a/package-source-builder/overlay/usr/bin/apertis-pkg-merge-upstream-to-downstreams
+++ b/package-source-builder/overlay/usr/bin/apertis-pkg-merge-upstream-to-downstreams
@@ -94,7 +94,7 @@ def main():
print("New target, doing merge")
proposed_branch = f"proposed-updates/{upstream_branch}/{ref[0:8]}"
git.checkout("-B", proposed_branch)
- apertis_pkg_merge_updates(f"--downstream={downstream_branch}", f"--upstream={upstream_branch}", "--local-version-suffix={local_suffix}", _fg=True)
+ apertis_pkg_merge_updates(f"--downstream={downstream_branch}", f"--upstream={upstream_branch}", f"--local-version-suffix={local_suffix}", _fg=True)
o = git('diff', '--quiet', f"HEAD..{downstream_branch}", _ok_code=[0,1])
if o.exit_code == 1:
print("Merge done, pushing")
--
GitLab