Make diff-dists understand .pgdg versions better

diff --git a/jenkins/pgapt-jobs.yaml b/jenkins/pgapt-jobs.yaml
index a0fef44ba65c07b56a29c386e959b24b51a3fa11..cccaa256fa8309869f15bfed9ebdc5fb05f24ceb 100644 (file)
--- a/jenkins/pgapt-jobs.yaml
+++ b/jenkins/pgapt-jobs.yaml
@@ -86,7 +86,7 @@
     add_version_tag_plain: &add_version_tag_plain |
             import java.util.regex.Matcher;
             for (a in manager.build.getArtifacts()) {
-                    m = (a =~ /([^\/]*)\.dsc/);
+                    m = (a =~ /.*([^\/]*)\.dsc/);
                     if (m.matches()) {
                             manager.addShortText(m[0][1]);
                             break;

diff --git a/repo/bin/diff-dists b/repo/bin/diff-dists
index b10faf0bb9480150fd9a246a59c912523ecaaa98..35a78523ec448dfa83d6e0371714d082d230a017 100755 (executable)
--- a/repo/bin/diff-dists
+++ b/repo/bin/diff-dists
@@ -38,14 +38,16 @@ while (<S1>) {
 close S1;
 
 foreach my $pkg (sort keys %pkg1) {
-       my $ver1 = $pkg1{$pkg};
+       my $ver1 = my $ver1mangled = $pkg1{$pkg};
+       $ver1mangled =~ s/.pgdg(?:[\d.]+)?\+\d$//; # remove .pgdg80+1
        if (not exists $pkg2{$pkg}) {
                print "$pkg $ver1 <missing>\n" if ($fulldiff);
                next;
        }
 
-       my $ver2 = $pkg2{$pkg};
-       if ($ver1 eq $ver2 or $ver2 =~ /^\Q$ver1\E[.~]pgdg\+\d$/) {
+       my $ver2 = my $ver2mangled = $pkg2{$pkg};
+       $ver2mangled =~ s/.pgdg(?:[\d.]+)?\+\d$//; # remove .pgdg80+1
+       if ($ver1 eq $ver2 or $ver1 eq $ver2mangled or $ver1mangled eq $ver2mangled) {
                #print "OK: $pkg $ver1 $ver2\n";
                delete $pkg2{$pkg};
                next;

diff --git a/repo/bin/missing-in-dist b/repo/bin/missing-in-dist
new file mode 100755 (executable)
index 0000000..3caf8e5
--- /dev/null
+++ b/repo/bin/missing-in-dist
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+set -eu
+
+BINDIR=$(dirname $0)
+DISTS=$BINDIR/../dists
+DIST="$1"
+
+$BINDIR/diff-dists -f \
+       <(bzcat $DISTS/sid-pgdg-testing/main/source/Sources.bz2) \
+       <(bzcat $DISTS/$DIST-pgdg-testing/main/source/Sources.bz2)