From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 5/8] pakfire: Add version suffix when in a certain tree Date: Tue, 11 Feb 2020 14:28:50 +0000 Message-ID: <20200211142853.8561-6-michael.tremer@ipfire.org> In-Reply-To: <20200211142853.8561-1-michael.tremer@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============9197116713140126081==" List-Id: --===============9197116713140126081== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Signed-off-by: Michael Tremer --- src/pakfire/lib/functions.pl | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/pakfire/lib/functions.pl b/src/pakfire/lib/functions.pl index cda6f00a9..ddb1e9aad 100644 --- a/src/pakfire/lib/functions.pl +++ b/src/pakfire/lib/functions.pl @@ -965,6 +965,13 @@ sub get_arch() { return $machine; } +sub get_tree() { + # Return stable if nothing is set + return "stable" unless (defined $pakfiresettings{'TREE'}); + + return $pakfiresettings{'TREE'}; +} + sub make_version() { my $version = ""; @@ -978,6 +985,14 @@ sub make_version() { $version .= $1; } + # Append suffix for tree + my $tree = &get_tree(); + if ($tree eq "testing") { + $version .= ".1"; + } elsif ($tree eq "unstable") { + $version .= ".2"; + } + # Append architecture my $arch = &get_arch(); if ($arch ne "i586") { -- 2.20.1 --===============9197116713140126081==--