[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#860204: debian-cd: Fix update_tasks on non-Linux arches



Source: debian-cd
Version: 3.1.20
Tags: patch
User: debian-bsd@lists.debian.org
Usertags: kfreebsd
X-Debbugs-Cc: debian-bsd@lists.debian.org

Hi!

tools/update_tasks was failing for me on kfreebsd, with:
    update_tasks: Can't determine arch

In the filename of the coreutils .deb, the architecture part
may contain a hyphen in the case of hurd-i386 or kfreebsd-*.
But it currently only matches alpha or numeric.

Patch is attached.  Thanks!

Regards,
-- 
Steven Chamberlain
steven@pyro.eu.org
From c0104be3e511052c5cab4d561b5887abd4b4dd89 Mon Sep 17 00:00:00 2001
From: Steven Chamberlain <steven@pyro.eu.org>
Date: Wed, 12 Apr 2017 20:05:15 +0100
Subject: [PATCH] Fix update_tasks on non-Linux arches

In the filename of the coreutils .deb, the architecture part
may also contain a hyphen in the case of hurd-i386 or
kfreebsd-*
---
 tools/update_tasks | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/update_tasks b/tools/update_tasks
index b9fe207..03e03ac 100755
--- a/tools/update_tasks
+++ b/tools/update_tasks
@@ -44,7 +44,7 @@ if (defined($ENV{'FORCE_SID_TASKSEL'}) and $ENV{'FORCE_SID_TASKSEL'} eq '1') {
 # is a non -all package) to determine a valid arch for the rest of
 # this script
 my $coreutils_deb = `$basedir/tools/which_deb $mirror $codename coreutils binary`;
-if ($coreutils_deb =~ m/_([[:alnum:]]+)\.deb/) {
+if ($coreutils_deb =~ m/_([[:alnum:]-]+)\.deb/) {
     $arch = $1;
 } else {
     die "update_tasks: Can't determine arch!\n";
-- 
1.8.4.rc3

Attachment: signature.asc
Description: Digital signature


Reply to: