[calm - Cygwin server-side packaging maintenance script] branch master, updated. 20181020-16-g0089c50

jturney@sourceware.org jturney@sourceware.org
Mon May 27 17:24:00 GMT 2019




https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=0089c50d8bb9338941ac56c82d571721adfa7597

commit 0089c50d8bb9338941ac56c82d571721adfa7597
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=e191767c8f0b8a18915efb80a7e7be3caa517bd5

commit e191767c8f0b8a18915efb80a7e7be3caa517bd5
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=173955712e37afba9792cf0e4c14441935410539

commit 173955712e37afba9792cf0e4c14441935410539
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.
    
    Also use 'ForceType' rather than 'AddType' for an incomplete list of
    extensions.

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=734bf4ab5db8f962e73427d422f1f2ff6814e27f

commit 734bf4ab5db8f962e73427d422f1f2ff6814e27f
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Sat May 25 17:06:40 2019 +0100

    Tidy up packages.inc

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=3c48fbbc9c32ff7b69f2773cf7ec385b59c31d0a

commit 3c48fbbc9c32ff7b69f2773cf7ec385b59c31d0a
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Sat May 25 13:50:29 2019 +0100

    Don't list previous maintainer in summary page if orphaned

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=c00be919232151aaea77410944b4bde725899c10

commit c00be919232151aaea77410944b4bde725899c10
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Sat May 25 13:08:04 2019 +0100

    Add navigation frame to package summary page
    
    Add navigation frame to package summary page
    Set execute permission required for SSI

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=440e650624f5accf55ccc1c75462f6bc8f55fa9f

commit 440e650624f5accf55ccc1c75462f6bc8f55fa9f
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Wed Nov 8 14:28:04 2017 +0000

    Generate a per-package summary HTML page


Diff:
---
 calm/pkg2html.py                                   |    7 ++++++-
 test/testdata/htdocs.expected/x86/arc/.htaccess    |    1 +
 .../htdocs.expected/x86/base-cygwin/.htaccess      |    1 +
 .../testdata/htdocs.expected/x86/corrupt/.htaccess |    1 +
 .../htdocs.expected/x86/cygwin-debuginfo/.htaccess |    1 +
 .../htdocs.expected/x86/cygwin-devel/.htaccess     |    1 +
 test/testdata/htdocs.expected/x86/cygwin/.htaccess |    1 +
 .../htdocs.expected/x86/keychain/.htaccess         |    1 +
 .../htdocs.expected/x86/libdns_sd-devel/.htaccess  |    1 +
 .../htdocs.expected/x86/libdns_sd1/.htaccess       |    1 +
 .../htdocs.expected/x86/mDNSResponder/.htaccess    |    1 +
 test/testdata/htdocs.expected/x86/obs-a/.htaccess  |    1 +
 test/testdata/htdocs.expected/x86/obs-b/.htaccess  |    1 +
 .../testdata/htdocs.expected/x86/openssh/.htaccess |    1 +
 .../per-version-replacement-hint-only/.htaccess    |    1 +
 .../htdocs.expected/x86/per-version/.htaccess      |    1 +
 .../x86/perl-Net-SMTP-SSL/.htaccess                |    1 +
 .../testdata/htdocs.expected/x86/rpm-doc/.htaccess |    1 +
 .../htdocs.expected/x86/staleversion/.htaccess     |    1 +
 test/testdata/htdocs.expected/x86/test-c/.htaccess |    1 +
 test/testdata/htdocs.expected/x86/test-d/.htaccess |    1 +
 test/testdata/htdocs.expected/x86/test-e/.htaccess |    1 +
 .../htdocs.expected/x86/testpackage/.htaccess      |    1 +
 23 files changed, 28 insertions(+), 1 deletions(-)

diff --git a/calm/pkg2html.py b/calm/pkg2html.py
index 4a6f9ab..1e817a6 100755
--- a/calm/pkg2html.py
+++ b/calm/pkg2html.py
@@ -198,7 +198,7 @@ def update_package_listings(args, packages):
                     print('<br><br>', file=f)
 
                     print('<ul>', file=f)
-                    for arch in packages:
+                    for arch in sorted(packages):
                         if p in packages[arch]:
 
                             print('<li><span class="detail">%s</span></li>' % arch, file=f)
@@ -315,6 +315,9 @@ def write_arch_listing(args, packages, arch):
                     print('RedirectMatch temp /packages/%s/%s/$ /packages/summary/%s.html' % (arch, p, p),
                           file=f)
 
+                    # listing files don't have the extension, but are html
+                    print('ForceType text/html', file=f)
+
         # this file should exist, so remove from the toremove list
         if htaccess in toremove:
             toremove.remove(htaccess)
@@ -323,6 +326,8 @@ def write_arch_listing(args, packages, arch):
         # for each tarfile, write tarfile listing
         #
         listings = os.listdir(dir)
+        listings.remove('.htaccess')
+
         for t in itertools.chain.from_iterable([packages[p].tars[vr] for vr in packages[p].tars]):
             fver = re.sub(r'\.tar.*$', '', t)
             listing = os.path.join(dir, fver)
diff --git a/test/testdata/htdocs.expected/x86/arc/.htaccess b/test/testdata/htdocs.expected/x86/arc/.htaccess
index b6f7222..e0e8ed7 100644
--- a/test/testdata/htdocs.expected/x86/arc/.htaccess
+++ b/test/testdata/htdocs.expected/x86/arc/.htaccess
@@ -1 +1,2 @@
 RedirectMatch temp /packages/x86/arc/$ /packages/summary/arc.html
+ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/base-cygwin/.htaccess b/test/testdata/htdocs.expected/x86/base-cygwin/.htaccess
index f36859d..5e486b7 100644
--- a/test/testdata/htdocs.expected/x86/base-cygwin/.htaccess
+++ b/test/testdata/htdocs.expected/x86/base-cygwin/.htaccess
@@ -1 +1,2 @@
 RedirectMatch temp /packages/x86/base-cygwin/$ /packages/summary/base-cygwin.html
+ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/corrupt/.htaccess b/test/testdata/htdocs.expected/x86/corrupt/.htaccess
index 9fc620c..dc680b2 100644
--- a/test/testdata/htdocs.expected/x86/corrupt/.htaccess
+++ b/test/testdata/htdocs.expected/x86/corrupt/.htaccess
@@ -1 +1,2 @@
 RedirectMatch temp /packages/x86/corrupt/$ /packages/summary/corrupt.html
+ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/cygwin-debuginfo/.htaccess b/test/testdata/htdocs.expected/x86/cygwin-debuginfo/.htaccess
index d6d3ae9..4f50a18 100644
--- a/test/testdata/htdocs.expected/x86/cygwin-debuginfo/.htaccess
+++ b/test/testdata/htdocs.expected/x86/cygwin-debuginfo/.htaccess
@@ -1 +1,2 @@
 RedirectMatch temp /packages/x86/cygwin-debuginfo/$ /packages/summary/cygwin-debuginfo.html
+ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/cygwin-devel/.htaccess b/test/testdata/htdocs.expected/x86/cygwin-devel/.htaccess
index 485def4..f92bc48 100644
--- a/test/testdata/htdocs.expected/x86/cygwin-devel/.htaccess
+++ b/test/testdata/htdocs.expected/x86/cygwin-devel/.htaccess
@@ -1 +1,2 @@
 RedirectMatch temp /packages/x86/cygwin-devel/$ /packages/summary/cygwin-devel.html
+ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/cygwin/.htaccess b/test/testdata/htdocs.expected/x86/cygwin/.htaccess
index 236e56c..43660ff 100644
--- a/test/testdata/htdocs.expected/x86/cygwin/.htaccess
+++ b/test/testdata/htdocs.expected/x86/cygwin/.htaccess
@@ -1 +1,2 @@
 RedirectMatch temp /packages/x86/cygwin/$ /packages/summary/cygwin.html
+ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/keychain/.htaccess b/test/testdata/htdocs.expected/x86/keychain/.htaccess
index 8d3d599..46abb74 100644
--- a/test/testdata/htdocs.expected/x86/keychain/.htaccess
+++ b/test/testdata/htdocs.expected/x86/keychain/.htaccess
@@ -1 +1,2 @@
 RedirectMatch temp /packages/x86/keychain/$ /packages/summary/keychain.html
+ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/libdns_sd-devel/.htaccess b/test/testdata/htdocs.expected/x86/libdns_sd-devel/.htaccess
index 7f0f9d1..978905a 100644
--- a/test/testdata/htdocs.expected/x86/libdns_sd-devel/.htaccess
+++ b/test/testdata/htdocs.expected/x86/libdns_sd-devel/.htaccess
@@ -1 +1,2 @@
 RedirectMatch temp /packages/x86/libdns_sd-devel/$ /packages/summary/libdns_sd-devel.html
+ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/libdns_sd1/.htaccess b/test/testdata/htdocs.expected/x86/libdns_sd1/.htaccess
index a17f2f5..7d807df 100644
--- a/test/testdata/htdocs.expected/x86/libdns_sd1/.htaccess
+++ b/test/testdata/htdocs.expected/x86/libdns_sd1/.htaccess
@@ -1 +1,2 @@
 RedirectMatch temp /packages/x86/libdns_sd1/$ /packages/summary/libdns_sd1.html
+ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/mDNSResponder/.htaccess b/test/testdata/htdocs.expected/x86/mDNSResponder/.htaccess
index 553057c..328ef83 100644
--- a/test/testdata/htdocs.expected/x86/mDNSResponder/.htaccess
+++ b/test/testdata/htdocs.expected/x86/mDNSResponder/.htaccess
@@ -1 +1,2 @@
 RedirectMatch temp /packages/x86/mDNSResponder/$ /packages/summary/mDNSResponder.html
+ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/obs-a/.htaccess b/test/testdata/htdocs.expected/x86/obs-a/.htaccess
index 42f7903..c90412c 100644
--- a/test/testdata/htdocs.expected/x86/obs-a/.htaccess
+++ b/test/testdata/htdocs.expected/x86/obs-a/.htaccess
@@ -1 +1,2 @@
 RedirectMatch temp /packages/x86/obs-a/$ /packages/summary/obs-a.html
+ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/obs-b/.htaccess b/test/testdata/htdocs.expected/x86/obs-b/.htaccess
index 021ec1a..e5f2850 100644
--- a/test/testdata/htdocs.expected/x86/obs-b/.htaccess
+++ b/test/testdata/htdocs.expected/x86/obs-b/.htaccess
@@ -1 +1,2 @@
 RedirectMatch temp /packages/x86/obs-b/$ /packages/summary/obs-b.html
+ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/openssh/.htaccess b/test/testdata/htdocs.expected/x86/openssh/.htaccess
index 1c3372c..db91b67 100644
--- a/test/testdata/htdocs.expected/x86/openssh/.htaccess
+++ b/test/testdata/htdocs.expected/x86/openssh/.htaccess
@@ -1 +1,2 @@
 RedirectMatch temp /packages/x86/openssh/$ /packages/summary/openssh.html
+ForceType text/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 09c705c..57fcc7d 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,2 @@
 RedirectMatch temp /packages/x86/per-version-replacement-hint-only/$ /packages/summary/per-version-replacement-hint-only.html
+ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/per-version/.htaccess b/test/testdata/htdocs.expected/x86/per-version/.htaccess
index be1dd87..ccdcb07 100644
--- a/test/testdata/htdocs.expected/x86/per-version/.htaccess
+++ b/test/testdata/htdocs.expected/x86/per-version/.htaccess
@@ -1 +1,2 @@
 RedirectMatch temp /packages/x86/per-version/$ /packages/summary/per-version.html
+ForceType text/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 af94a60..99fd802 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,2 @@
 RedirectMatch temp /packages/x86/perl-Net-SMTP-SSL/$ /packages/summary/perl-Net-SMTP-SSL.html
+ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/rpm-doc/.htaccess b/test/testdata/htdocs.expected/x86/rpm-doc/.htaccess
index b571229..08ffd45 100644
--- a/test/testdata/htdocs.expected/x86/rpm-doc/.htaccess
+++ b/test/testdata/htdocs.expected/x86/rpm-doc/.htaccess
@@ -1 +1,2 @@
 RedirectMatch temp /packages/x86/rpm-doc/$ /packages/summary/rpm-doc.html
+ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/staleversion/.htaccess b/test/testdata/htdocs.expected/x86/staleversion/.htaccess
index b5a5f84..fb62c8b 100644
--- a/test/testdata/htdocs.expected/x86/staleversion/.htaccess
+++ b/test/testdata/htdocs.expected/x86/staleversion/.htaccess
@@ -1 +1,2 @@
 RedirectMatch temp /packages/x86/staleversion/$ /packages/summary/staleversion.html
+ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/test-c/.htaccess b/test/testdata/htdocs.expected/x86/test-c/.htaccess
index 2702238..117af97 100644
--- a/test/testdata/htdocs.expected/x86/test-c/.htaccess
+++ b/test/testdata/htdocs.expected/x86/test-c/.htaccess
@@ -1 +1,2 @@
 RedirectMatch temp /packages/x86/test-c/$ /packages/summary/test-c.html
+ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/test-d/.htaccess b/test/testdata/htdocs.expected/x86/test-d/.htaccess
index 9e15ad7..53c678a 100644
--- a/test/testdata/htdocs.expected/x86/test-d/.htaccess
+++ b/test/testdata/htdocs.expected/x86/test-d/.htaccess
@@ -1 +1,2 @@
 RedirectMatch temp /packages/x86/test-d/$ /packages/summary/test-d.html
+ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/test-e/.htaccess b/test/testdata/htdocs.expected/x86/test-e/.htaccess
index 5bfe3dc..c2bbfec 100644
--- a/test/testdata/htdocs.expected/x86/test-e/.htaccess
+++ b/test/testdata/htdocs.expected/x86/test-e/.htaccess
@@ -1 +1,2 @@
 RedirectMatch temp /packages/x86/test-e/$ /packages/summary/test-e.html
+ForceType text/html
diff --git a/test/testdata/htdocs.expected/x86/testpackage/.htaccess b/test/testdata/htdocs.expected/x86/testpackage/.htaccess
index d5110f6..1d452b0 100644
--- a/test/testdata/htdocs.expected/x86/testpackage/.htaccess
+++ b/test/testdata/htdocs.expected/x86/testpackage/.htaccess
@@ -1 +1,2 @@
 RedirectMatch temp /packages/x86/testpackage/$ /packages/summary/testpackage.html
+ForceType text/html



More information about the Cygwin-apps-cvs mailing list