From 31cd1b48de66c0bc22ca202c19e8aa7f7f4b0164 Mon Sep 17 00:00:00 2001
From: Ritesh Raj Sarraf <ritesh.sarraf@collabora.com>
Date: Tue, 9 Mar 2021 15:18:57 +0000
Subject: [PATCH] apertis-pkg-merge-*: Use a default suffix consistent with the
project name
Switch from coX to apertisX as the default Debian changelog suffix.
Signed-off-by: Ritesh Raj Sarraf <ritesh.sarraf@collabora.com>
Signed-off-by: Emanuele Aina <emanuele.aina@collabora.com>
---
.gitlab-ci.yml | 6 +++---
.../overlay/usr/bin/apertis-pkg-merge-updates | 2 +-
.../usr/bin/apertis-pkg-merge-upstream-to-downstreams | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e2d72a2..910d7fe 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -138,12 +138,12 @@ test-package-source-builder:
- test "$(pristine-lfs list | wc -l)" = 2
- cd ..
- git clone https://gitlab.apertis.org/infrastructure/test-data/fixture-dash-unmodified
- - ": Verify we correctly detect when there are no local changes and use the co0 suffix"
+ - ": Verify we correctly detect when there are no local changes and use the apertis0 suffix"
- cd fixture-dash-unmodified
- apertis-pkg-merge-updates --package dash --upstream debian/buster --downstream apertis/v2020dev0
- git log --graph --oneline --decorate
- git diff debian/buster..
- - test "$(dpkg-parsechangelog -SVersion)" = 0.5.10.2-5co0
+ - test "$(dpkg-parsechangelog -SVersion)" = 0.5.10.2-5apertis0
- test "$(dpkg-parsechangelog -SDistribution)" = apertis
- cd ..
- rm -rf fixture-dash-unmodified
@@ -162,7 +162,7 @@ test-package-source-builder:
- apertis-pkg-merge-updates --package dash --upstream debian/buster --downstream apertis/v2020dev0
- git log --graph --oneline --decorate
- git diff debian/buster..
- - test "$(dpkg-parsechangelog -SVersion)" = 0.5.10.2-5co1
+ - test "$(dpkg-parsechangelog -SVersion)" = 0.5.10.2-5apertis1
- test "$(dpkg-parsechangelog -SDistribution)" = UNRELEASED
- cd ..
diff --git a/package-source-builder/overlay/usr/bin/apertis-pkg-merge-updates b/package-source-builder/overlay/usr/bin/apertis-pkg-merge-updates
index 11302f6..dad4f9b 100755
--- a/package-source-builder/overlay/usr/bin/apertis-pkg-merge-updates
+++ b/package-source-builder/overlay/usr/bin/apertis-pkg-merge-updates
@@ -94,7 +94,7 @@ def main():
parser.add_argument('--package', dest='package', type=str, help='the package name (e.g. glib2.0)') # TODO: figure this out from the repo
parser.add_argument('--downstream', dest='downstream', type=str, help='the downstream branch (e.g. apertis/v2020dev0)')
parser.add_argument('--upstream', dest='upstream', type=str, required=True, help='the upstream branch (e.g. debian/buster)')
- parser.add_argument('--local-version-suffix', dest="local_suffix", type=str, default="co", help='the local version suffix to be used in the new changelog entry')
+ parser.add_argument('--local-version-suffix', dest="local_suffix", type=str, default="apertis", help='the local version suffix to be used in the new changelog entry')
args = parser.parse_args()
package_name = args.package
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 8d7ade8..29eef00 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
@@ -67,7 +67,7 @@ def main():
required=True, help='the upstream branch (e.g. debian/buster)')
parser.add_argument('--downstreams', dest='downstreams', type=str,
required=True, help='downstream branches, colon seperate (e.g. apertis/v2020dev0:apertis/v2019)')
- parser.add_argument('--local-version-suffix', dest="local_suffix", type=str, default="co", help='the local version suffix to be used in new changelog entries')
+ parser.add_argument('--local-version-suffix', dest="local_suffix", type=str, default="apertis", help='the local version suffix to be used in new changelog entries')
parser.add_argument('project_url', type=str, help='git project url to push updates to')
args = parser.parse_args()
--
GitLab