1
0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2025-03-03 14:52:21 +02:00

Remove Debian test repo after PostgreSQL 10 release.

This commit is contained in:
David Steele 2017-10-05 12:33:13 -04:00
parent d89b7d5862
commit abea4d1fd5
3 changed files with 7 additions and 3 deletions

View File

@ -32,6 +32,10 @@
<release-item>
<p>Warnings in C builds treated as errors.</p>
</release-item>
<release-item>
<p>Remove Debian test repo after PostgreSQL 10 release.</p>
</release-item>
</release-refactor-list>
</release-test-list>
</release>

View File

@ -448,8 +448,7 @@ sub containerBuild
{
$strScript .=
" echo 'deb http://apt.postgresql.org/pub/repos/apt/ " .
$$oVm{$strOS}{&VM_OS_REPO} . '-pgdg main' . ($strOS ne VM_U12 ? ' 10' : '') .
"' >> /etc/apt/sources.list.d/pgdg.list && \\\n" .
$$oVm{$strOS}{&VM_OS_REPO} . "-pgdg main' >> /etc/apt/sources.list.d/pgdg.list && \\\n" .
" wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - && \\\n" .
" apt-get update";
}

View File

@ -93,7 +93,8 @@ sub new
my @stryVersionToken = split(/ /, $strOutLog);
@stryVersionToken = split(/\./, $stryVersionToken[2]);
my $strDbVersionActual =
trim($stryVersionToken[0]) . (defined($stryVersionToken[1]) ? '.' . trim($stryVersionToken[1]) : '');
trim($stryVersionToken[0]) .
(defined($stryVersionToken[1]) && trim($stryVersionToken[0]) < 10 ? '.' . trim($stryVersionToken[1]) : '');
# Warn if this is a devel/alpha/beta version
my $strVersionRegExp = '(devel|((alpha|beta|rc)[0-9]+))$';