public inbox for cygwin-apps-cvs@sourceware.org
help / color / mirror / Atom feed
* [calm - Cygwin server-side packaging maintenance script] branch master, updated. 20181020-16-gc1a97d8
@ 2019-05-26 21:19 jturney
0 siblings, 0 replies; only message in thread
From: jturney @ 2019-05-26 21:19 UTC (permalink / raw)
To: cygwin-apps-cvs
https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=c1a97d8fa48e000ab8ab41c8b4d0f0b95964e8a7
commit c1a97d8fa48e000ab8ab41c8b4d0f0b95964e8a7
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Sun May 26 12:03:19 2019 +0100
Write package metadata summary
Write a summary of package metadata in json format.
https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=6226b1d8aee2e8c79fffb5e4224209330533fed1
commit 6226b1d8aee2e8c79fffb5e4224209330533fed1
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Sun May 26 19:40:47 2019 +0100
Show test status for versions in package summary page
https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=0584f71052c55f454247495c5042e0f7c1a027c6
commit 0584f71052c55f454247495c5042e0f7c1a027c6
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date: Sat May 25 17:19:48 2019 +0100
Redirect directory index of package file lists to package summary page
This needs to use RedirectMatch with an exact match, as we don't want to
redirect other URLs which have this directory URL as a prefix.
Diff:
---
calm/pkg2html.py | 2 +-
test/testdata/htdocs.expected/x86/arc/.htaccess | 2 +-
.../htdocs.expected/x86/base-cygwin/.htaccess | 2 +-
.../testdata/htdocs.expected/x86/corrupt/.htaccess | 2 +-
.../htdocs.expected/x86/cygwin-debuginfo/.htaccess | 2 +-
.../htdocs.expected/x86/cygwin-devel/.htaccess | 2 +-
test/testdata/htdocs.expected/x86/cygwin/.htaccess | 2 +-
.../htdocs.expected/x86/keychain/.htaccess | 2 +-
.../htdocs.expected/x86/libdns_sd-devel/.htaccess | 2 +-
.../htdocs.expected/x86/libdns_sd1/.htaccess | 2 +-
.../htdocs.expected/x86/mDNSResponder/.htaccess | 2 +-
test/testdata/htdocs.expected/x86/obs-a/.htaccess | 2 +-
test/testdata/htdocs.expected/x86/obs-b/.htaccess | 2 +-
.../testdata/htdocs.expected/x86/openssh/.htaccess | 2 +-
.../per-version-replacement-hint-only/.htaccess | 2 +-
.../htdocs.expected/x86/per-version/.htaccess | 2 +-
.../x86/perl-Net-SMTP-SSL/.htaccess | 2 +-
.../testdata/htdocs.expected/x86/rpm-doc/.htaccess | 2 +-
.../htdocs.expected/x86/staleversion/.htaccess | 2 +-
test/testdata/htdocs.expected/x86/test-c/.htaccess | 2 +-
test/testdata/htdocs.expected/x86/test-d/.htaccess | 2 +-
test/testdata/htdocs.expected/x86/test-e/.htaccess | 2 +-
.../htdocs.expected/x86/testpackage/.htaccess | 2 +-
23 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/calm/pkg2html.py b/calm/pkg2html.py
index 1bdbfe9..4a6f9ab 100755
--- a/calm/pkg2html.py
+++ b/calm/pkg2html.py
@@ -312,7 +312,7 @@ def write_arch_listing(args, packages, arch):
# for which file lists were available. Redirect that index
# page to the summary page, which now has that information
# (and more).
- print('Redirect temp /packages/%s/%s/ /packages/summary/%s.html' % (arch, p, p),
+ print('RedirectMatch temp /packages/%s/%s/$ /packages/summary/%s.html' % (arch, p, p),
file=f)
# this file should exist, so remove from the toremove list
diff --git a/test/testdata/htdocs.expected/x86/arc/.htaccess b/test/testdata/htdocs.expected/x86/arc/.htaccess
index 459b359..b6f7222 100644
--- a/test/testdata/htdocs.expected/x86/arc/.htaccess
+++ b/test/testdata/htdocs.expected/x86/arc/.htaccess
@@ -1 +1 @@
-Redirect temp /packages/x86/arc/ /packages/summary/arc.html
+RedirectMatch temp /packages/x86/arc/$ /packages/summary/arc.html
diff --git a/test/testdata/htdocs.expected/x86/base-cygwin/.htaccess b/test/testdata/htdocs.expected/x86/base-cygwin/.htaccess
index 9a36f3a..f36859d 100644
--- a/test/testdata/htdocs.expected/x86/base-cygwin/.htaccess
+++ b/test/testdata/htdocs.expected/x86/base-cygwin/.htaccess
@@ -1 +1 @@
-Redirect temp /packages/x86/base-cygwin/ /packages/summary/base-cygwin.html
+RedirectMatch temp /packages/x86/base-cygwin/$ /packages/summary/base-cygwin.html
diff --git a/test/testdata/htdocs.expected/x86/corrupt/.htaccess b/test/testdata/htdocs.expected/x86/corrupt/.htaccess
index d5e6209..9fc620c 100644
--- a/test/testdata/htdocs.expected/x86/corrupt/.htaccess
+++ b/test/testdata/htdocs.expected/x86/corrupt/.htaccess
@@ -1 +1 @@
-Redirect temp /packages/x86/corrupt/ /packages/summary/corrupt.html
+RedirectMatch temp /packages/x86/corrupt/$ /packages/summary/corrupt.html
diff --git a/test/testdata/htdocs.expected/x86/cygwin-debuginfo/.htaccess b/test/testdata/htdocs.expected/x86/cygwin-debuginfo/.htaccess
index 9e500d7..d6d3ae9 100644
--- a/test/testdata/htdocs.expected/x86/cygwin-debuginfo/.htaccess
+++ b/test/testdata/htdocs.expected/x86/cygwin-debuginfo/.htaccess
@@ -1 +1 @@
-Redirect temp /packages/x86/cygwin-debuginfo/ /packages/summary/cygwin-debuginfo.html
+RedirectMatch temp /packages/x86/cygwin-debuginfo/$ /packages/summary/cygwin-debuginfo.html
diff --git a/test/testdata/htdocs.expected/x86/cygwin-devel/.htaccess b/test/testdata/htdocs.expected/x86/cygwin-devel/.htaccess
index 0302567..485def4 100644
--- a/test/testdata/htdocs.expected/x86/cygwin-devel/.htaccess
+++ b/test/testdata/htdocs.expected/x86/cygwin-devel/.htaccess
@@ -1 +1 @@
-Redirect temp /packages/x86/cygwin-devel/ /packages/summary/cygwin-devel.html
+RedirectMatch temp /packages/x86/cygwin-devel/$ /packages/summary/cygwin-devel.html
diff --git a/test/testdata/htdocs.expected/x86/cygwin/.htaccess b/test/testdata/htdocs.expected/x86/cygwin/.htaccess
index 4ae3f05..236e56c 100644
--- a/test/testdata/htdocs.expected/x86/cygwin/.htaccess
+++ b/test/testdata/htdocs.expected/x86/cygwin/.htaccess
@@ -1 +1 @@
-Redirect temp /packages/x86/cygwin/ /packages/summary/cygwin.html
+RedirectMatch temp /packages/x86/cygwin/$ /packages/summary/cygwin.html
diff --git a/test/testdata/htdocs.expected/x86/keychain/.htaccess b/test/testdata/htdocs.expected/x86/keychain/.htaccess
index 8168f3a..8d3d599 100644
--- a/test/testdata/htdocs.expected/x86/keychain/.htaccess
+++ b/test/testdata/htdocs.expected/x86/keychain/.htaccess
@@ -1 +1 @@
-Redirect temp /packages/x86/keychain/ /packages/summary/keychain.html
+RedirectMatch temp /packages/x86/keychain/$ /packages/summary/keychain.html
diff --git a/test/testdata/htdocs.expected/x86/libdns_sd-devel/.htaccess b/test/testdata/htdocs.expected/x86/libdns_sd-devel/.htaccess
index b319667..7f0f9d1 100644
--- a/test/testdata/htdocs.expected/x86/libdns_sd-devel/.htaccess
+++ b/test/testdata/htdocs.expected/x86/libdns_sd-devel/.htaccess
@@ -1 +1 @@
-Redirect temp /packages/x86/libdns_sd-devel/ /packages/summary/libdns_sd-devel.html
+RedirectMatch temp /packages/x86/libdns_sd-devel/$ /packages/summary/libdns_sd-devel.html
diff --git a/test/testdata/htdocs.expected/x86/libdns_sd1/.htaccess b/test/testdata/htdocs.expected/x86/libdns_sd1/.htaccess
index c315409..a17f2f5 100644
--- a/test/testdata/htdocs.expected/x86/libdns_sd1/.htaccess
+++ b/test/testdata/htdocs.expected/x86/libdns_sd1/.htaccess
@@ -1 +1 @@
-Redirect temp /packages/x86/libdns_sd1/ /packages/summary/libdns_sd1.html
+RedirectMatch temp /packages/x86/libdns_sd1/$ /packages/summary/libdns_sd1.html
diff --git a/test/testdata/htdocs.expected/x86/mDNSResponder/.htaccess b/test/testdata/htdocs.expected/x86/mDNSResponder/.htaccess
index a16a16b..553057c 100644
--- a/test/testdata/htdocs.expected/x86/mDNSResponder/.htaccess
+++ b/test/testdata/htdocs.expected/x86/mDNSResponder/.htaccess
@@ -1 +1 @@
-Redirect temp /packages/x86/mDNSResponder/ /packages/summary/mDNSResponder.html
+RedirectMatch temp /packages/x86/mDNSResponder/$ /packages/summary/mDNSResponder.html
diff --git a/test/testdata/htdocs.expected/x86/obs-a/.htaccess b/test/testdata/htdocs.expected/x86/obs-a/.htaccess
index 253da20..42f7903 100644
--- a/test/testdata/htdocs.expected/x86/obs-a/.htaccess
+++ b/test/testdata/htdocs.expected/x86/obs-a/.htaccess
@@ -1 +1 @@
-Redirect temp /packages/x86/obs-a/ /packages/summary/obs-a.html
+RedirectMatch temp /packages/x86/obs-a/$ /packages/summary/obs-a.html
diff --git a/test/testdata/htdocs.expected/x86/obs-b/.htaccess b/test/testdata/htdocs.expected/x86/obs-b/.htaccess
index dd94c2a..021ec1a 100644
--- a/test/testdata/htdocs.expected/x86/obs-b/.htaccess
+++ b/test/testdata/htdocs.expected/x86/obs-b/.htaccess
@@ -1 +1 @@
-Redirect temp /packages/x86/obs-b/ /packages/summary/obs-b.html
+RedirectMatch temp /packages/x86/obs-b/$ /packages/summary/obs-b.html
diff --git a/test/testdata/htdocs.expected/x86/openssh/.htaccess b/test/testdata/htdocs.expected/x86/openssh/.htaccess
index 032315c..1c3372c 100644
--- a/test/testdata/htdocs.expected/x86/openssh/.htaccess
+++ b/test/testdata/htdocs.expected/x86/openssh/.htaccess
@@ -1 +1 @@
-Redirect temp /packages/x86/openssh/ /packages/summary/openssh.html
+RedirectMatch temp /packages/x86/openssh/$ /packages/summary/openssh.html
diff --git a/test/testdata/htdocs.expected/x86/per-version-replacement-hint-only/.htaccess b/test/testdata/htdocs.expected/x86/per-version-replacement-hint-only/.htaccess
index 8b5f52f..09c705c 100644
--- a/test/testdata/htdocs.expected/x86/per-version-replacement-hint-only/.htaccess
+++ b/test/testdata/htdocs.expected/x86/per-version-replacement-hint-only/.htaccess
@@ -1 +1 @@
-Redirect temp /packages/x86/per-version-replacement-hint-only/ /packages/summary/per-version-replacement-hint-only.html
+RedirectMatch temp /packages/x86/per-version-replacement-hint-only/$ /packages/summary/per-version-replacement-hint-only.html
diff --git a/test/testdata/htdocs.expected/x86/per-version/.htaccess b/test/testdata/htdocs.expected/x86/per-version/.htaccess
index 9979909..be1dd87 100644
--- a/test/testdata/htdocs.expected/x86/per-version/.htaccess
+++ b/test/testdata/htdocs.expected/x86/per-version/.htaccess
@@ -1 +1 @@
-Redirect temp /packages/x86/per-version/ /packages/summary/per-version.html
+RedirectMatch temp /packages/x86/per-version/$ /packages/summary/per-version.html
diff --git a/test/testdata/htdocs.expected/x86/perl-Net-SMTP-SSL/.htaccess b/test/testdata/htdocs.expected/x86/perl-Net-SMTP-SSL/.htaccess
index f8bcf57..af94a60 100644
--- a/test/testdata/htdocs.expected/x86/perl-Net-SMTP-SSL/.htaccess
+++ b/test/testdata/htdocs.expected/x86/perl-Net-SMTP-SSL/.htaccess
@@ -1 +1 @@
-Redirect temp /packages/x86/perl-Net-SMTP-SSL/ /packages/summary/perl-Net-SMTP-SSL.html
+RedirectMatch temp /packages/x86/perl-Net-SMTP-SSL/$ /packages/summary/perl-Net-SMTP-SSL.html
diff --git a/test/testdata/htdocs.expected/x86/rpm-doc/.htaccess b/test/testdata/htdocs.expected/x86/rpm-doc/.htaccess
index 1bff57d..b571229 100644
--- a/test/testdata/htdocs.expected/x86/rpm-doc/.htaccess
+++ b/test/testdata/htdocs.expected/x86/rpm-doc/.htaccess
@@ -1 +1 @@
-Redirect temp /packages/x86/rpm-doc/ /packages/summary/rpm-doc.html
+RedirectMatch temp /packages/x86/rpm-doc/$ /packages/summary/rpm-doc.html
diff --git a/test/testdata/htdocs.expected/x86/staleversion/.htaccess b/test/testdata/htdocs.expected/x86/staleversion/.htaccess
index 14383a7..b5a5f84 100644
--- a/test/testdata/htdocs.expected/x86/staleversion/.htaccess
+++ b/test/testdata/htdocs.expected/x86/staleversion/.htaccess
@@ -1 +1 @@
-Redirect temp /packages/x86/staleversion/ /packages/summary/staleversion.html
+RedirectMatch temp /packages/x86/staleversion/$ /packages/summary/staleversion.html
diff --git a/test/testdata/htdocs.expected/x86/test-c/.htaccess b/test/testdata/htdocs.expected/x86/test-c/.htaccess
index 1d92888..2702238 100644
--- a/test/testdata/htdocs.expected/x86/test-c/.htaccess
+++ b/test/testdata/htdocs.expected/x86/test-c/.htaccess
@@ -1 +1 @@
-Redirect temp /packages/x86/test-c/ /packages/summary/test-c.html
+RedirectMatch temp /packages/x86/test-c/$ /packages/summary/test-c.html
diff --git a/test/testdata/htdocs.expected/x86/test-d/.htaccess b/test/testdata/htdocs.expected/x86/test-d/.htaccess
index d427219..9e15ad7 100644
--- a/test/testdata/htdocs.expected/x86/test-d/.htaccess
+++ b/test/testdata/htdocs.expected/x86/test-d/.htaccess
@@ -1 +1 @@
-Redirect temp /packages/x86/test-d/ /packages/summary/test-d.html
+RedirectMatch temp /packages/x86/test-d/$ /packages/summary/test-d.html
diff --git a/test/testdata/htdocs.expected/x86/test-e/.htaccess b/test/testdata/htdocs.expected/x86/test-e/.htaccess
index 3ad2e69..5bfe3dc 100644
--- a/test/testdata/htdocs.expected/x86/test-e/.htaccess
+++ b/test/testdata/htdocs.expected/x86/test-e/.htaccess
@@ -1 +1 @@
-Redirect temp /packages/x86/test-e/ /packages/summary/test-e.html
+RedirectMatch temp /packages/x86/test-e/$ /packages/summary/test-e.html
diff --git a/test/testdata/htdocs.expected/x86/testpackage/.htaccess b/test/testdata/htdocs.expected/x86/testpackage/.htaccess
index cc3711a..d5110f6 100644
--- a/test/testdata/htdocs.expected/x86/testpackage/.htaccess
+++ b/test/testdata/htdocs.expected/x86/testpackage/.htaccess
@@ -1 +1 @@
-Redirect temp /packages/x86/testpackage/ /packages/summary/testpackage.html
+RedirectMatch temp /packages/x86/testpackage/$ /packages/summary/testpackage.html
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2019-05-26 21:19 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-26 21:19 [calm - Cygwin server-side packaging maintenance script] branch master, updated. 20181020-16-gc1a97d8 jturney
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).