Commit 9032743e authored by Héctor Orón Martínez's avatar Héctor Orón Martínez

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

Publish ddeb files

See merge request !11
parents e2e53ddc 5fae2c69
......@@ -11,13 +11,13 @@ makes the changes file inconsistent
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/backend/bs_publish b/src/backend/bs_publish
index 57ed0c6..83d91ac 100755
index 193ddbc..2b47a5d 100755
--- a/src/backend/bs_publish
+++ b/src/backend/bs_publish
@@ -1508,7 +1508,7 @@ sub publish {
$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";
+ $p = "$arch/$bin";
} elsif ($bin =~ /\.exe$/) {
......
Description: Publish Ubuntu ddeb files to the repositories
Author: Lucas Kanashiro <lucas.kanashiro@collabora.com>
Last-Updated: 2019-03-21
--- a/src/backend/bs_publish
+++ b/src/backend/bs_publish
@@ -1507,7 +1507,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 = "$arch/$bin";
} elsif ($bin =~ /\.exe$/) {
$p = "$bin";
From: Lucas Kanashiro <lucas.kanashiro@collabora.com>
Date: Fri, 22 Mar 2019 10:34:26 -0300
Subject: Publish Ubuntu ddeb files to the repositories
For historical reasons, Ubuntu uses the extension .ddeb instead of .deb
for detached debug symbols (-dbgsym) packages. Ubuntu derivatives built
in OBS will also produce packages with this name. Treat them the same as
.deb and .udeb packages.
---
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 b4235a4..2d79abb 100755
--- a/src/backend/bs_publish
+++ b/src/backend/bs_publish
@@ -66,7 +66,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 ddeb deb pkg.tar.gz pkg.tar.xz};
my $binsufsre = join('|', map {"\Q$_\E"} @binsufs);
my @binsufsrsync = map {"--include=*.$_"} @binsufs;
@@ -123,7 +123,7 @@ sub fillpkgdescription {
$hit = $p;
last;
}
- if ($pn =~ /^\Q$name\E_([^_]+)_[^_]+\.u?deb$/) {
+ if ($pn =~ /^\Q$name\E_([^_]+)_[^_]+\.[ud]?deb$/) {
$hit = $p;
last;
}
@@ -209,7 +209,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;
@@ -223,7 +223,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;
@@ -798,7 +798,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 (/^(.*)-Build\d\d\d\d(-Media\d)(\.iso?(\.sha256)?)$/s) {
@@ -1438,7 +1438,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 =~ /\.exe$/) {
$p = "$bin";
backend-publish-udebs-in-repo.patch
publish-ddeb-files.patch
collabora/publish-asc-files.patch
database.yml-settings.patch
gemfile-tweaks.patch
......@@ -35,4 +36,3 @@ collabora/backend-Handle-ERROR_WANT_-READ-WRITE-from-ssl-reads.patch
collabora/backend-Support-https-urls-for-package-downloads.patch
collabora/BSConfig-Make-every-architecture-its-own-relsync-pool.patch
collabora/BSConfig-Read-a-BSConfig.local.pm-if-it-exists.patch
collabora/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