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

jturney@sourceware.org jturney@sourceware.org
Sat May 25 12:14:00 GMT 2019




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

commit 7d05e0f72b9bdb6e6706d801e30e3f9b4d2b90cb
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


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

diff --git a/calm/pkg2html.py b/calm/pkg2html.py
index be64c6c..32a519f 100755
--- a/calm/pkg2html.py
+++ b/calm/pkg2html.py
@@ -143,6 +143,7 @@ def update_package_listings(args, packages):
             logging.debug('writing %s' % summary)
             if not args.dryrun:
                 with open(summary, 'w') as f:
+                    os.fchmod(f.fileno(), 0o755)
 
                     arch_packages = None
                     for arch in common_constants.ARCHES:
@@ -165,7 +166,9 @@ def update_package_listings(args, packages):
                     <title>%s</title>
                     </head>
                     <body>
+                    <!--#include virtual="/navbar.html" -->
                     <div id="main">
+                    <!--#include virtual="/top.html" -->
                     <h1>Package: %s</h1>''' % (title, p)), file=f)
 
                     print('<span class="detail">sdesc</span>: %s<br><br>' % sdesc(arch_packages, p, bv), file=f)
diff --git a/test/testdata/htdocs.expected/summary/arc.html b/test/testdata/htdocs.expected/summary/arc.html
index 6f13aef..6fa25b5 100644
--- a/test/testdata/htdocs.expected/summary/arc.html
+++ b/test/testdata/htdocs.expected/summary/arc.html
@@ -6,7 +6,9 @@
 <title>Cygwin Package Summary for arc</title>
 </head>
 <body>
+<!--#include virtual="/navbar.html" -->
 <div id="main">
+<!--#include virtual="/top.html" -->
 <h1>Package: arc</h1>
 <span class="detail">sdesc</span>: The ARC archive utility<br><br>
 <span class="detail">ldesc</span>: This program is based on the MSDOS ARC program, version 5.21, plus a
diff --git a/test/testdata/htdocs.expected/summary/base-cygwin.html b/test/testdata/htdocs.expected/summary/base-cygwin.html
index fc6b266..2262e23 100644
--- a/test/testdata/htdocs.expected/summary/base-cygwin.html
+++ b/test/testdata/htdocs.expected/summary/base-cygwin.html
@@ -6,7 +6,9 @@
 <title>Cygwin Package Summary for base-cygwin</title>
 </head>
 <body>
+<!--#include virtual="/navbar.html" -->
 <div id="main">
+<!--#include virtual="/top.html" -->
 <h1>Package: base-cygwin</h1>
 <span class="detail">sdesc</span>: Initial base installation helper script<br><br>
 <span class="detail">ldesc</span>: Initial base installation helper script.<br><br>
diff --git a/test/testdata/htdocs.expected/summary/corrupt.html b/test/testdata/htdocs.expected/summary/corrupt.html
index 80316d5..bfa7add 100644
--- a/test/testdata/htdocs.expected/summary/corrupt.html
+++ b/test/testdata/htdocs.expected/summary/corrupt.html
@@ -6,7 +6,9 @@
 <title>Cygwin Package Summary for corrupt</title>
 </head>
 <body>
+<!--#include virtual="/navbar.html" -->
 <div id="main">
+<!--#include virtual="/top.html" -->
 <h1>Package: corrupt</h1>
 <span class="detail">sdesc</span>: A corrupt package<br><br>
 <span class="detail">ldesc</span>: A package containing corrupt archives<br><br>
diff --git a/test/testdata/htdocs.expected/summary/cygwin-debuginfo.html b/test/testdata/htdocs.expected/summary/cygwin-debuginfo.html
index f311971..1a365f1 100644
--- a/test/testdata/htdocs.expected/summary/cygwin-debuginfo.html
+++ b/test/testdata/htdocs.expected/summary/cygwin-debuginfo.html
@@ -6,7 +6,9 @@
 <title>Cygwin Package Summary for cygwin-debuginfo</title>
 </head>
 <body>
+<!--#include virtual="/navbar.html" -->
 <div id="main">
+<!--#include virtual="/top.html" -->
 <h1>Package: cygwin-debuginfo</h1>
 <span class="detail">sdesc</span>: Debug info for cygwin<br><br>
 <span class="detail">ldesc</span>: This package contains files necessary for debugging the
diff --git a/test/testdata/htdocs.expected/summary/cygwin-devel.html b/test/testdata/htdocs.expected/summary/cygwin-devel.html
index 1576218..f28aecb 100644
--- a/test/testdata/htdocs.expected/summary/cygwin-devel.html
+++ b/test/testdata/htdocs.expected/summary/cygwin-devel.html
@@ -6,7 +6,9 @@
 <title>Cygwin Package Summary for cygwin-devel</title>
 </head>
 <body>
+<!--#include virtual="/navbar.html" -->
 <div id="main">
+<!--#include virtual="/top.html" -->
 <h1>Package: cygwin-devel</h1>
 <span class="detail">sdesc</span>: Core development files<br><br>
 <span class="detail">ldesc</span>: Core development files required to build Cygwin packages<br><br>
diff --git a/test/testdata/htdocs.expected/summary/cygwin.html b/test/testdata/htdocs.expected/summary/cygwin.html
index 187b9da..735d9d5 100644
--- a/test/testdata/htdocs.expected/summary/cygwin.html
+++ b/test/testdata/htdocs.expected/summary/cygwin.html
@@ -6,7 +6,9 @@
 <title>Cygwin Package Summary for cygwin</title>
 </head>
 <body>
+<!--#include virtual="/navbar.html" -->
 <div id="main">
+<!--#include virtual="/top.html" -->
 <h1>Package: cygwin</h1>
 <span class="detail">sdesc</span>: The UNIX emulation engine<br><br>
 <span class="detail">ldesc</span>: The UNIX emulation engine<br><br>
diff --git a/test/testdata/htdocs.expected/summary/keychain.html b/test/testdata/htdocs.expected/summary/keychain.html
index c4e8ce7..4a6fd02 100644
--- a/test/testdata/htdocs.expected/summary/keychain.html
+++ b/test/testdata/htdocs.expected/summary/keychain.html
@@ -6,7 +6,9 @@
 <title>Cygwin Package Summary for keychain</title>
 </head>
 <body>
+<!--#include virtual="/navbar.html" -->
 <div id="main">
+<!--#include virtual="/top.html" -->
 <h1>Package: keychain</h1>
 <span class="detail">sdesc</span>: Key manager for OpenSSH<br><br>
 <span class="detail">ldesc</span>: Keychain is an OpenSSH key manager, typically run from
diff --git a/test/testdata/htdocs.expected/summary/libdns_sd-devel.html b/test/testdata/htdocs.expected/summary/libdns_sd-devel.html
index 0678e5c..7cea685 100644
--- a/test/testdata/htdocs.expected/summary/libdns_sd-devel.html
+++ b/test/testdata/htdocs.expected/summary/libdns_sd-devel.html
@@ -6,7 +6,9 @@
 <title>Cygwin Package Summary for libdns_sd-devel</title>
 </head>
 <body>
+<!--#include virtual="/navbar.html" -->
 <div id="main">
+<!--#include virtual="/top.html" -->
 <h1>Package: libdns_sd-devel</h1>
 <span class="detail">sdesc</span>: Bonjour Zeroconf implementation<br><br>
 <span class="detail">ldesc</span>: Bonjour, also known as zero-configuration networking, enables
diff --git a/test/testdata/htdocs.expected/summary/libdns_sd1.html b/test/testdata/htdocs.expected/summary/libdns_sd1.html
index cfe6a56..492fb70 100644
--- a/test/testdata/htdocs.expected/summary/libdns_sd1.html
+++ b/test/testdata/htdocs.expected/summary/libdns_sd1.html
@@ -6,7 +6,9 @@
 <title>Cygwin Package Summary for libdns_sd1</title>
 </head>
 <body>
+<!--#include virtual="/navbar.html" -->
 <div id="main">
+<!--#include virtual="/top.html" -->
 <h1>Package: libdns_sd1</h1>
 <span class="detail">sdesc</span>: Bonjour Zeroconf implementation<br><br>
 <span class="detail">ldesc</span>: Bonjour, also known as zero-configuration networking, enables
diff --git a/test/testdata/htdocs.expected/summary/mDNSResponder.html b/test/testdata/htdocs.expected/summary/mDNSResponder.html
index 746101e..8f454b4 100644
--- a/test/testdata/htdocs.expected/summary/mDNSResponder.html
+++ b/test/testdata/htdocs.expected/summary/mDNSResponder.html
@@ -6,7 +6,9 @@
 <title>Cygwin Package Summary for mDNSResponder</title>
 </head>
 <body>
+<!--#include virtual="/navbar.html" -->
 <div id="main">
+<!--#include virtual="/top.html" -->
 <h1>Package: mDNSResponder</h1>
 <span class="detail">sdesc</span>: Bonjour Zeroconf implementation<br><br>
 <span class="detail">ldesc</span>: Bonjour, also known as zero-configuration networking, enables
diff --git a/test/testdata/htdocs.expected/summary/obs-a.html b/test/testdata/htdocs.expected/summary/obs-a.html
index e2591e6..0d39aa6 100644
--- a/test/testdata/htdocs.expected/summary/obs-a.html
+++ b/test/testdata/htdocs.expected/summary/obs-a.html
@@ -6,7 +6,9 @@
 <title>Cygwin Package Summary for obs-a</title>
 </head>
 <body>
+<!--#include virtual="/navbar.html" -->
 <div id="main">
+<!--#include virtual="/top.html" -->
 <h1>Package: obs-a</h1>
 <span class="detail">sdesc</span>: obsolete package A<br><br>
 <span class="detail">ldesc</span>: obs-a<br><br>
diff --git a/test/testdata/htdocs.expected/summary/obs-b.html b/test/testdata/htdocs.expected/summary/obs-b.html
index 8de2270..649a59d 100644
--- a/test/testdata/htdocs.expected/summary/obs-b.html
+++ b/test/testdata/htdocs.expected/summary/obs-b.html
@@ -6,7 +6,9 @@
 <title>Cygwin Package Summary for obs-b</title>
 </head>
 <body>
+<!--#include virtual="/navbar.html" -->
 <div id="main">
+<!--#include virtual="/top.html" -->
 <h1>Package: obs-b</h1>
 <span class="detail">sdesc</span>: obsolete package B<br><br>
 <span class="detail">ldesc</span>: obs-b<br><br>
diff --git a/test/testdata/htdocs.expected/summary/openssh.html b/test/testdata/htdocs.expected/summary/openssh.html
index 334d96c..73c64a1 100644
--- a/test/testdata/htdocs.expected/summary/openssh.html
+++ b/test/testdata/htdocs.expected/summary/openssh.html
@@ -6,7 +6,9 @@
 <title>Cygwin Package Summary for openssh</title>
 </head>
 <body>
+<!--#include virtual="/navbar.html" -->
 <div id="main">
+<!--#include virtual="/top.html" -->
 <h1>Package: openssh</h1>
 <span class="detail">sdesc</span>: The OpenSSH server and client programs<br><br>
 <span class="detail">ldesc</span>: OpenSSH is a program for logging into a remote machine and for
diff --git a/test/testdata/htdocs.expected/summary/per-version-replacement-hint-only.html b/test/testdata/htdocs.expected/summary/per-version-replacement-hint-only.html
index 3bfc642..b0025b5 100644
--- a/test/testdata/htdocs.expected/summary/per-version-replacement-hint-only.html
+++ b/test/testdata/htdocs.expected/summary/per-version-replacement-hint-only.html
@@ -6,7 +6,9 @@
 <title>Cygwin Package Summary for per-version-replacement-hint-only</title>
 </head>
 <body>
+<!--#include virtual="/navbar.html" -->
 <div id="main">
+<!--#include virtual="/top.html" -->
 <h1>Package: per-version-replacement-hint-only</h1>
 <span class="detail">sdesc</span>: Per-version hint test package<br><br>
 <span class="detail">ldesc</span>: Per-version hint test package<br><br>
diff --git a/test/testdata/htdocs.expected/summary/per-version.html b/test/testdata/htdocs.expected/summary/per-version.html
index f179c85..155b5d1 100644
--- a/test/testdata/htdocs.expected/summary/per-version.html
+++ b/test/testdata/htdocs.expected/summary/per-version.html
@@ -6,7 +6,9 @@
 <title>Cygwin Package Summary for per-version</title>
 </head>
 <body>
+<!--#include virtual="/navbar.html" -->
 <div id="main">
+<!--#include virtual="/top.html" -->
 <h1>Package: per-version</h1>
 <span class="detail">sdesc</span>: Per-version hint test package<br><br>
 <span class="detail">ldesc</span>: Per-version hint test package<br><br>
diff --git a/test/testdata/htdocs.expected/summary/perl-Net-SMTP-SSL.html b/test/testdata/htdocs.expected/summary/perl-Net-SMTP-SSL.html
index 03580b7..b9350d7 100644
--- a/test/testdata/htdocs.expected/summary/perl-Net-SMTP-SSL.html
+++ b/test/testdata/htdocs.expected/summary/perl-Net-SMTP-SSL.html
@@ -6,7 +6,9 @@
 <title>Cygwin Package Summary for perl-Net-SMTP-SSL</title>
 </head>
 <body>
+<!--#include virtual="/navbar.html" -->
 <div id="main">
+<!--#include virtual="/top.html" -->
 <h1>Package: perl-Net-SMTP-SSL</h1>
 <span class="detail">sdesc</span>: Perl distribution Net-SMTP-SSL<br><br>
 <span class="detail">ldesc</span>: Implements the same API as Net::SMTP, but uses IO::Socket::SSL for
diff --git a/test/testdata/htdocs.expected/summary/rpm-doc.html b/test/testdata/htdocs.expected/summary/rpm-doc.html
index 190c8f3..acd408a 100644
--- a/test/testdata/htdocs.expected/summary/rpm-doc.html
+++ b/test/testdata/htdocs.expected/summary/rpm-doc.html
@@ -6,7 +6,9 @@
 <title>Cygwin Package Summary for rpm-doc</title>
 </head>
 <body>
+<!--#include virtual="/navbar.html" -->
 <div id="main">
+<!--#include virtual="/top.html" -->
 <h1>Package: rpm-doc</h1>
 <span class="detail">sdesc</span>: Obsolete package for RPM package management system manual pages (extra text to so repr is not one line)<br><br>
 <span class="detail">ldesc</span>: rpm-doc<br><br>
diff --git a/test/testdata/htdocs.expected/summary/staleversion.html b/test/testdata/htdocs.expected/summary/staleversion.html
index 031ab45..2d08ca4 100644
--- a/test/testdata/htdocs.expected/summary/staleversion.html
+++ b/test/testdata/htdocs.expected/summary/staleversion.html
@@ -6,7 +6,9 @@
 <title>Cygwin Package Summary for staleversion</title>
 </head>
 <body>
+<!--#include virtual="/navbar.html" -->
 <div id="main">
+<!--#include virtual="/top.html" -->
 <h1>Package: staleversion</h1>
 <span class="detail">sdesc</span>: Test package for stale version removal<br><br>
 <span class="detail">ldesc</span>: Test package for stale version removal<br><br>
diff --git a/test/testdata/htdocs.expected/summary/test-c.html b/test/testdata/htdocs.expected/summary/test-c.html
index cf3757c..7eb0d93 100644
--- a/test/testdata/htdocs.expected/summary/test-c.html
+++ b/test/testdata/htdocs.expected/summary/test-c.html
@@ -6,7 +6,9 @@
 <title>Cygwin Package Summary for test-c</title>
 </head>
 <body>
+<!--#include virtual="/navbar.html" -->
 <div id="main">
+<!--#include virtual="/top.html" -->
 <h1>Package: test-c</h1>
 <span class="detail">sdesc</span>: test package C<br><br>
 <span class="detail">ldesc</span>: test-c<br><br>
diff --git a/test/testdata/htdocs.expected/summary/test-d.html b/test/testdata/htdocs.expected/summary/test-d.html
index dd13f6e..c9e7bba 100644
--- a/test/testdata/htdocs.expected/summary/test-d.html
+++ b/test/testdata/htdocs.expected/summary/test-d.html
@@ -6,7 +6,9 @@
 <title>Cygwin Package Summary for test-d</title>
 </head>
 <body>
+<!--#include virtual="/navbar.html" -->
 <div id="main">
+<!--#include virtual="/top.html" -->
 <h1>Package: test-d</h1>
 <span class="detail">sdesc</span>: test package D<br><br>
 <span class="detail">ldesc</span>: test-d<br><br>
diff --git a/test/testdata/htdocs.expected/summary/test-e.html b/test/testdata/htdocs.expected/summary/test-e.html
index ec57c10..9fa5cf1 100644
--- a/test/testdata/htdocs.expected/summary/test-e.html
+++ b/test/testdata/htdocs.expected/summary/test-e.html
@@ -6,7 +6,9 @@
 <title>Cygwin Package Summary for test-e</title>
 </head>
 <body>
+<!--#include virtual="/navbar.html" -->
 <div id="main">
+<!--#include virtual="/top.html" -->
 <h1>Package: test-e</h1>
 <span class="detail">sdesc</span>: test package E<br><br>
 <span class="detail">ldesc</span>: test-e<br><br>
diff --git a/test/testdata/htdocs.expected/summary/testpackage.html b/test/testdata/htdocs.expected/summary/testpackage.html
index 6410b6e..dd1a902 100644
--- a/test/testdata/htdocs.expected/summary/testpackage.html
+++ b/test/testdata/htdocs.expected/summary/testpackage.html
@@ -6,7 +6,9 @@
 <title>Cygwin Package Summary for testpackage</title>
 </head>
 <body>
+<!--#include virtual="/navbar.html" -->
 <div id="main">
+<!--#include virtual="/top.html" -->
 <h1>Package: testpackage</h1>
 <span class="detail">sdesc</span>: A test package (stuff & other stuff)<br><br>
 <span class="detail">ldesc</span>: A test package (stuff & other stuff)<br><br>



More information about the Cygwin-apps-cvs mailing list