1
0
mirror of synced 2026-01-11 23:42:56 +00:00

Fix missing "|" in regex in Debian's 20-setup-apt

Closes: #997668
This commit is contained in:
Axel Beckert 2021-10-24 02:23:35 +02:00
parent 00527f64b2
commit 7ebb0f41a4
13 changed files with 19 additions and 12 deletions

View File

@ -14,7 +14,7 @@
# #
TMPDIR ?= /tmp TMPDIR ?= /tmp
DIST_PREFIX = ${TMPDIR} DIST_PREFIX = ${TMPDIR}
VERSION = 4.9 VERSION = 4.9.1
DEBVERSION = $(shell echo $(VERSION)|sed 's/\(rc\|pre\|beta\|alpha\)/~\1/') DEBVERSION = $(shell echo $(VERSION)|sed 's/\(rc\|pre\|beta\|alpha\)/~\1/')
BASE = xen-tools BASE = xen-tools
VCS = git VCS = git

View File

@ -872,7 +872,7 @@ my $MOUNT_POINT = undef;
# #
# Release number. # Release number.
# #
my $RELEASE = '4.9'; my $RELEASE = '4.9.1';
# #

View File

@ -121,7 +121,7 @@ $CONFIG{ 'template' } = '/etc/xen-tools/xm-nfs.tmpl';
# #
# Release number. # Release number.
# #
my $RELEASE = '4.9'; my $RELEASE = '4.9.1';
# store version number away. # store version number away.

View File

@ -167,7 +167,7 @@ my %CONFIG;
# #
# Release number. # Release number.
# #
my $RELEASE = '4.9'; my $RELEASE = '4.9.1';
# #

View File

@ -106,7 +106,7 @@ $CONFIG{ 'extension' } = '.cfg';
# #
# Release number. # Release number.
# #
my $RELEASE = '4.9'; my $RELEASE = '4.9.1';

View File

@ -111,7 +111,7 @@ my %CONFIG;
# #
# Release number. # Release number.
# #
my $RELEASE = '4.9'; my $RELEASE = '4.9.1';
# #

View File

@ -113,7 +113,7 @@ my %CONFIG;
# #
# Release number. # Release number.
# #
my $RELEASE = '4.9'; my $RELEASE = '4.9.1';
# #

View File

@ -148,7 +148,7 @@ $CONFIG{ 'extension' } = '.cfg';
# #
# Release number. # Release number.
# #
my $RELEASE = '4.9'; my $RELEASE = '4.9.1';

View File

@ -100,7 +100,7 @@ my %CONFIG;
# #
# Release number. # Release number.
# #
my $RELEASE = '4.9'; my $RELEASE = '4.9.1';

View File

@ -79,7 +79,7 @@ use strict;
# #
# Release number. # Release number.
# #
my $RELEASE = '4.9'; my $RELEASE = '4.9.1';
# Init # Init
my $mirror = ''; my $mirror = '';

View File

@ -113,7 +113,7 @@ my %CONFIG;
# #
# Release number. # Release number.
# #
my $RELEASE = '4.9'; my $RELEASE = '4.9.1';
# #

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
xen-tools (4.9.1-1) UNRELEASED; urgency=medium
* New upstream bugfix release.
+ Fix missing "|" in regex in Debian's 20-setup-apt. (Closes: #997668)
-- Axel Beckert <abe@debian.org> Sun, 24 Oct 2021 02:02:49 +0200
xen-tools (4.9-1) unstable; urgency=medium xen-tools (4.9-1) unstable; urgency=medium
* New upstream bugfix and minor feature release. * New upstream bugfix and minor feature release.

View File

@ -66,7 +66,7 @@ if ( test "${dist}" "!=" "sid" && test "${dist}" "!=" "unstable" && \
test -e /etc/apt/sources.list && \ test -e /etc/apt/sources.list && \
grep ^deb.*security -r /etc/apt/sources.list /etc/apt/sources.list.d >/dev/null 2>/dev/null ) ; then grep ^deb.*security -r /etc/apt/sources.list /etc/apt/sources.list.d >/dev/null 2>/dev/null ) ; then
if echo "${dist}" | egrep -q '\b(sarge|etch|lenny|squeeze|wheezyjessie|stretch|buster)\b'; then if echo "${dist}" | egrep -q '\b(sarge|etch|lenny|squeeze|wheezy|jessie|stretch|buster)\b'; then
cat <<E_O_APT >> ${prefix}/etc/apt/sources.list cat <<E_O_APT >> ${prefix}/etc/apt/sources.list
# #