[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 712425ff0bbe96700de5a1b865d58730ba9c6b90

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 712425ff0bbe96700de5a1b865d58730ba9c6b90

[Arne Fitzenreiter]

[-- Attachment #1: Type: text/plain, Size: 4284 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  712425ff0bbe96700de5a1b865d58730ba9c6b90 (commit)
       via  6cd35da57ecf795a51d61cd848df77e6dd5fbd97 (commit)
       via  fd90cadc97559b1d78c202d5560a93a3ecabef5a (commit)
      from  5cbcd514def1b63606d2139634a4f7a31af89205 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 712425ff0bbe96700de5a1b865d58730ba9c6b90
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Mon Feb 24 18:51:24 2020 +0000

    pakfire: Re-install previous core update when in testing mode
    
    Fixes: #12302
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
    Tested-by: Michael Tremer <michael.tremer(a)ipfire.org>
    Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

commit 6cd35da57ecf795a51d61cd848df77e6dd5fbd97
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Mon Feb 24 19:20:12 2020 +0000

    core142: ship updated fireinfo.cgi
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

commit fd90cadc97559b1d78c202d5560a93a3ecabef5a
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Sun Feb 23 16:13:46 2020 +0100

    fireinfo.cgi: Use pakfire lib to gather the pakfire version.
    
    Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/core/142/filelists/files | 1 +
 html/cgi-bin/fireinfo.cgi                 | 3 ++-
 src/pakfire/lib/functions.pl              | 6 ++++++
 3 files changed, 9 insertions(+), 1 deletion(-)

Difference in files:
diff --git a/config/rootfiles/core/142/filelists/files b/config/rootfiles/core/142/filelists/files
index 12df9c26d..69d6eb7bc 100644
--- a/config/rootfiles/core/142/filelists/files
+++ b/config/rootfiles/core/142/filelists/files
@@ -9,6 +9,7 @@ lib/udev/network-hotplug-bridges
 opt/pakfire/etc/pakfire.conf
 opt/pakfire/lib/functions.pl
 srv/web/ipfire/cgi-bin/dns.cgi
+srv/web/ipfire/cgi-bin/fireingo.cgi
 srv/web/ipfire/cgi-bin/pakfire.cgi
 srv/web/ipfire/cgi-bin/proxy.cgi
 var/ipfire/suricata/ruleset-sources
diff --git a/html/cgi-bin/fireinfo.cgi b/html/cgi-bin/fireinfo.cgi
index 08fee3d8a..967e250c7 100644
--- a/html/cgi-bin/fireinfo.cgi
+++ b/html/cgi-bin/fireinfo.cgi
@@ -28,6 +28,7 @@ use CGI::Carp 'fatalsToBrowser';
 require '/var/ipfire/general-functions.pl';
 require "${General::swroot}/lang.pl";
 require "${General::swroot}/header.pl";
+require '/opt/pakfire/lib/functions.pl';
 
 my $configfile = "/var/ipfire/main/send_profile";
 
@@ -84,7 +85,7 @@ if ($errormessage) {
 }
 
 my $ipfire_version = `cat /etc/system-release`;
-my $pakfire_version = `cat /opt/pakfire/etc/pakfire.conf | grep "version =" | cut -d\\" -f2`;
+my $pakfire_version = &Pakfire::make_version();
 my $kernel_version = `uname -a`;
 
 &Header::openbox('100%', 'left', $Lang::tr{'fireinfo system version'});
diff --git a/src/pakfire/lib/functions.pl b/src/pakfire/lib/functions.pl
index ddb1e9aad..45e3427b1 100644
--- a/src/pakfire/lib/functions.pl
+++ b/src/pakfire/lib/functions.pl
@@ -768,6 +768,12 @@ sub upgradecore {
 	getcoredb("noforce");
 	eval(`grep "core_" $Conf::dbdir/lists/core-list.db`);
 	if ("$core_release" > "$Conf::core_mine") {
+		# Safety check for lazy testers:
+		# Before we upgrade to the latest release, we re-install the previous release
+		# to make sure that the tester has always been on the latest version.
+		my $tree = &get_tree();
+		$Conf::core_mine-- if ($tree eq "testing" || $tree eq "unstable");
+
 		message("CORE UPGR: Upgrading from release $Conf::core_mine to $core_release");
 		
 		my @seq = `seq $Conf::core_mine $core_release`;


hooks/post-receive
--
IPFire 2.x development tree