Commit 91adacfd authored by Héctor Orón Martínez's avatar Héctor Orón Martínez

Merge branch 'publish-ddeb-files' into 'debian/master'

Publish Ubuntu ddeb files to the repositories

See merge request !17
parents 0c4ecc8d 532b204c
......@@ -2,6 +2,7 @@ open-build-service (2.9.4-3) UNRELEASED; urgency=medium
* Add patch to publish Debian upstream tarball signatures to the
repositories
* Add patch to publish Ubuntu ddeb files to the repositories
-- Lucas Kanashiro <kanashiro@debian.org> Wed, 20 Mar 2019 10:46:15 -0300
......
From: Lucas Kanashiro <lucas.kanashiro@collabora.com>
Date: Fri, 22 Mar 2019 08:29:38 -0300
Subject: Publish Ubuntu ddeb files to the repositories
---
src/backend/bs_publish | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/backend/bs_publish b/src/backend/bs_publish
index 46f8e92..d722259 100755
--- a/src/backend/bs_publish
+++ b/src/backend/bs_publish
@@ -71,7 +71,7 @@ my $extrepodb = "$BSConfig::bsdir/db/published";
my $myeventdir = "$eventdir/publish";
-my @binsufs = qw{rpm udeb deb pkg.tar.gz pkg.tar.xz};
+my @binsufs = qw{rpm udeb deb ddeb pkg.tar.gz pkg.tar.xz};
my $binsufsre = join('|', map {"\Q$_\E"} @binsufs);
my @binsufsrsync = map {"--include=*.$_"} @binsufs;
@@ -138,7 +138,7 @@ sub fillpkgdescription {
$hit = $p;
last;
}
- if ($pn =~ /^\Q$name\E_([^_]+)_[^_]+\.u?deb$/) {
+ if ($pn =~ /^\Q$name\E_([^_]+)_[^_]+\.[ud]?deb$/) {
$hit = $p;
last;
}
@@ -240,7 +240,7 @@ sub updatebinaryindex {
my $n;
if ($key =~ /(?:^|\/)([^\/]+)-[^-]+-[^-]+\.[a-zA-Z][^\/\.\-]*\.rpm$/) {
$n = $1;
- } elsif ($key =~ /(?:^|\/)([^\/]+)_([^\/]*)_[^\/]*\.u?deb$/) {
+ } elsif ($key =~ /(?:^|\/)([^\/]+)_([^\/]*)_[^\/]*\.[ud]?deb$/) {
$n = $1;
} elsif ($key =~ /(?:^|\/)([^\/]+)-[^-]+-[^-]+-[a-zA-Z][^\/\.\-]*\.pkg\.tar\..z$/) {
$n = $1;
@@ -254,7 +254,7 @@ sub updatebinaryindex {
my $n;
if ($key =~ /(?:^|\/)([^\/]+)-[^-]+-[^-]+\.[a-zA-Z][^\/\.\-]*\.rpm$/) {
$n = $1;
- } elsif ($key =~ /(?:^|\/)([^\/]+)_([^\/]*)_[^\/]*\.u?deb$/) {
+ } elsif ($key =~ /(?:^|\/)([^\/]+)_([^\/]*)_[^\/]*\.[ud]?deb$/) {
$n = $1;
} elsif ($key =~ /(?:^|\/)([^\/]+)-[^-]+-[^-]+-[a-zA-Z][^\/\.\-]*\.pkg\.tar\..z$/) {
$n = $1;
@@ -894,7 +894,7 @@ sub createrepo_staticlinks {
if (/^(.*)-([^-]*)-[^-]*\.rpm$/s) {
$link = "$1.rpm";
$link = "$1-$2.rpm" if $versioned;
- } elsif (/^(.*)_([^_]*)-[^_]*\.(u?deb)$/s) {
+ } elsif (/^(.*)_([^_]*)-[^_]*\.([ud]?deb)$/s) {
$link = "$1.$3";
$link = "${1}_$2.$3" if $versioned;
} elsif (/^(.*)-([^-]*)-([^-]*)-([^-]*)\.(AppImage?(\.zsync)?)$/s) {
@@ -1493,7 +1493,7 @@ sub publish {
if ($bin =~ /^.+-[^-]+-[^-]+\.([a-zA-Z][^\/\.\-]*)\.d?rpm$/) {
$p = "$1/$bin";
$p = $1 eq 'src' || $1 eq 'nosrc' ? "SRPMS/$bin" : "RPMS/$bin" if $repotype{'resarchhack'};
- } elsif ($bin =~ /^.+_[^_]+_([^_\.]+)\.u?deb$/) {
+ } elsif ($bin =~ /^.+_[^_]+_([^_\.]+)\.[ud]?deb$/) {
$p = "$1/$bin";
} elsif ($bin =~ /\.(?:AppImage|AppImage.zsync|snap|exe)?$/) {
$p = "$bin";
......@@ -19,3 +19,4 @@ drop-deprecated-activesupport-option.patch
rails5.2-fix-for-data-migrate.patch
rails-5.2-add-prefix-to-kiwi.patch
no-signing-server-config.patch
publish-ddeb-files.patch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment