From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 17707 invoked by alias); 26 May 2019 19:04:17 -0000 Mailing-List: contact cygwin-apps-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cygwin-apps-cvs-owner@sourceware.org Received: (qmail 17666 invoked by uid 9795); 26 May 2019 19:04:16 -0000 Date: Sun, 26 May 2019 19:04:00 -0000 Message-ID: <20190526190416.17655.qmail@sourceware.org> From: jturney@sourceware.org To: cygwin-apps-cvs@sourceware.org Subject: [calm - Cygwin server-side packaging maintenance script] branch master, updated. 20181020-15-g0df3089 X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: cc7255e5702e94a24ad868805f73d59bbdff0d63 X-Git-Newrev: 0df3089732ad9219098152f4d447bbff58631bee X-SW-Source: 2019-q2/txt/msg00006.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=0df3089732ad9219098152f4d447bbff58631bee commit 0df3089732ad9219098152f4d447bbff58631bee Author: Jon Turney 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=73b8fb58bccd846411f398ba60fe16d8a78f40ba commit 73b8fb58bccd846411f398ba60fe16d8a78f40ba Author: Jon Turney Date: Sat May 25 17:19:48 2019 +0100 Redirect directory index of package file lists to package summary page https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=9c4310d86578d1b00f05b02af1b7d3ef442390cb commit 9c4310d86578d1b00f05b02af1b7d3ef442390cb Author: Jon Turney Date: Sat May 25 17:06:40 2019 +0100 Tidy up packages.inc Diff: --- calm/pkg2html.py | 22 ++++++++-------- test/testdata/htdocs.expected/packages.inc | 2 - test/testdata/htdocs.expected/summary/arc.html | 6 ++-- .../htdocs.expected/summary/base-cygwin.html | 6 ++-- test/testdata/htdocs.expected/summary/corrupt.html | 6 ++-- .../htdocs.expected/summary/cygwin-debuginfo.html | 8 +++--- .../htdocs.expected/summary/cygwin-devel.html | 8 +++--- test/testdata/htdocs.expected/summary/cygwin.html | 14 +++++----- .../testdata/htdocs.expected/summary/keychain.html | 10 ++++---- .../htdocs.expected/summary/libdns_sd-devel.html | 4 +- .../htdocs.expected/summary/libdns_sd1.html | 4 +- .../htdocs.expected/summary/mDNSResponder.html | 6 ++-- test/testdata/htdocs.expected/summary/obs-a.html | 6 ++-- test/testdata/htdocs.expected/summary/obs-b.html | 6 ++-- test/testdata/htdocs.expected/summary/openssh.html | 6 ++-- .../summary/per-version-replacement-hint-only.html | 6 ++-- .../htdocs.expected/summary/per-version.html | 10 ++++---- .../htdocs.expected/summary/perl-Net-SMTP-SSL.html | 6 ++-- test/testdata/htdocs.expected/summary/rpm-doc.html | 8 +++--- .../htdocs.expected/summary/staleversion.html | 26 ++++++++++---------- test/testdata/htdocs.expected/summary/test-c.html | 6 ++-- test/testdata/htdocs.expected/summary/test-d.html | 6 ++-- test/testdata/htdocs.expected/summary/test-e.html | 6 ++-- .../htdocs.expected/summary/testpackage.html | 6 ++-- test/testdata/htdocs.expected/x86/arc/.htaccess | 4 +-- .../htdocs.expected/x86/base-cygwin/.htaccess | 4 +-- .../testdata/htdocs.expected/x86/corrupt/.htaccess | 4 +-- .../htdocs.expected/x86/cygwin-debuginfo/.htaccess | 4 +-- .../htdocs.expected/x86/cygwin-devel/.htaccess | 4 +-- test/testdata/htdocs.expected/x86/cygwin/.htaccess | 4 +-- .../htdocs.expected/x86/keychain/.htaccess | 4 +-- .../htdocs.expected/x86/libdns_sd-devel/.htaccess | 4 +-- .../htdocs.expected/x86/libdns_sd1/.htaccess | 4 +-- .../htdocs.expected/x86/mDNSResponder/.htaccess | 4 +-- test/testdata/htdocs.expected/x86/obs-a/.htaccess | 4 +-- test/testdata/htdocs.expected/x86/obs-b/.htaccess | 4 +-- .../testdata/htdocs.expected/x86/openssh/.htaccess | 4 +-- .../per-version-replacement-hint-only/.htaccess | 4 +-- .../htdocs.expected/x86/per-version/.htaccess | 4 +-- .../x86/perl-Net-SMTP-SSL/.htaccess | 4 +-- .../testdata/htdocs.expected/x86/rpm-doc/.htaccess | 4 +-- .../htdocs.expected/x86/staleversion/.htaccess | 4 +-- test/testdata/htdocs.expected/x86/test-c/.htaccess | 4 +-- test/testdata/htdocs.expected/x86/test-d/.htaccess | 4 +-- test/testdata/htdocs.expected/x86/test-e/.htaccess | 4 +-- .../htdocs.expected/x86/testpackage/.htaccess | 4 +-- 46 files changed, 118 insertions(+), 164 deletions(-) diff --git a/calm/pkg2html.py b/calm/pkg2html.py index a57b836..1bdbfe9 100755 --- a/calm/pkg2html.py +++ b/calm/pkg2html.py @@ -204,7 +204,7 @@ def update_package_listings(args, packages): print('
  • %s
    • ' % arch, file=f) print('', file=f) - print('', file=f) + print('', file=f) def tar_line(pn, p, category, v, arch, f): if category not in p.vermap[v]: @@ -213,7 +213,8 @@ def update_package_listings(args, packages): size = round(p.tar(v, category).size / 1024) name = v if category == 'install' else v + ' (source)' target = "%s-%s" % (pn, v) + ('' if category == 'install' else '-src') - print('' % (name, size, arch, pn, target), file=f) + test = 'test' if 'test' in p.version_hints[v] else 'stable' + print('' % (name, size, arch, pn, target, test), file=f) for version in sorted(packages[arch][p].vermap.keys(), key=lambda v: SetupVersion(v)): tar_line(p, packages[arch][p], 'install', version, arch, f) @@ -242,10 +243,11 @@ def update_package_listings(args, packages): with open(packages_inc, 'w') as index: os.fchmod(index.fileno(), 0o755) print(textwrap.dedent('''\ -

    Available Packages

    VersionPackage SizeFiles
    VersionPackage SizeFilesStatus
    %s%d kB[list of files]
    %s%d kB[list of files]%s
    '''), file=index) for p in sorted(package_list, key=package.sort_key): + if p.endswith('-debuginfo'): + continue arch_packages = None for arch in common_constants.ARCHES: @@ -305,15 +307,13 @@ def write_arch_listing(args, packages, arch): logging.debug('writing %s' % htaccess) if not args.dryrun or args.force: with open(htaccess, 'w') as f: - - print(textwrap.dedent('''\ - Options Indexes - IndexOptions -FancyIndexing - AddType text/html 1 2 3 4 5 6 7 8 9'''), + # We used to allow access to the directory listing as a + # crude way of listing the versions of the package available + # 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), file=f) - # XXX: omitting 0 here doesn't make much sense. and this - # doesn't help for src packages, so is it actually having - # any effect? # this file should exist, so remove from the toremove list if htaccess in toremove: diff --git a/test/testdata/htdocs.expected/packages.inc b/test/testdata/htdocs.expected/packages.inc index ad4d882..af1c670 100755 --- a/test/testdata/htdocs.expected/packages.inc +++ b/test/testdata/htdocs.expected/packages.inc @@ -1,10 +1,8 @@ -

    Available Packages

    - diff --git a/test/testdata/htdocs.expected/summary/arc.html b/test/testdata/htdocs.expected/summary/arc.html index 6fa25b5..a848293 100644 --- a/test/testdata/htdocs.expected/summary/arc.html +++ b/test/testdata/htdocs.expected/summary/arc.html @@ -26,9 +26,9 @@ the best of packing, squeezing, or crunching is used.

    • x86
    arcThe ARC archive utility
    base-cygwinInitial base installation helper script
    corruptA corrupt package
    cygwinThe UNIX emulation engine
    cygwin-debuginfoDebug info for cygwin
    cygwin-develCore development files
    keychainKey manager for OpenSSH
    libdns_sd-develBonjour Zeroconf implementation
    - - - + + +
    VersionPackage SizeFiles
    4.32.7-101 kB[list of files]
    4.32.7-10 (source)1 kB[list of files]
    VersionPackage SizeFilesStatus
    4.32.7-101 kB[list of files]stable
    4.32.7-10 (source)1 kB[list of files]stable

    diff --git a/test/testdata/htdocs.expected/summary/base-cygwin.html b/test/testdata/htdocs.expected/summary/base-cygwin.html index 2262e23..24b3742 100644 --- a/test/testdata/htdocs.expected/summary/base-cygwin.html +++ b/test/testdata/htdocs.expected/summary/base-cygwin.html @@ -21,9 +21,9 @@ diff --git a/test/testdata/htdocs.expected/summary/corrupt.html b/test/testdata/htdocs.expected/summary/corrupt.html index bfa7add..4c311c2 100644 --- a/test/testdata/htdocs.expected/summary/corrupt.html +++ b/test/testdata/htdocs.expected/summary/corrupt.html @@ -21,9 +21,9 @@ diff --git a/test/testdata/htdocs.expected/summary/cygwin-debuginfo.html b/test/testdata/htdocs.expected/summary/cygwin-debuginfo.html index 1a365f1..af5d1e3 100644 --- a/test/testdata/htdocs.expected/summary/cygwin-debuginfo.html +++ b/test/testdata/htdocs.expected/summary/cygwin-debuginfo.html @@ -23,10 +23,10 @@ cygwin package with gdb.

    diff --git a/test/testdata/htdocs.expected/summary/cygwin-devel.html b/test/testdata/htdocs.expected/summary/cygwin-devel.html index f28aecb..d951336 100644 --- a/test/testdata/htdocs.expected/summary/cygwin-devel.html +++ b/test/testdata/htdocs.expected/summary/cygwin-devel.html @@ -21,10 +21,10 @@ diff --git a/test/testdata/htdocs.expected/summary/cygwin.html b/test/testdata/htdocs.expected/summary/cygwin.html index 735d9d5..cdd427e 100644 --- a/test/testdata/htdocs.expected/summary/cygwin.html +++ b/test/testdata/htdocs.expected/summary/cygwin.html @@ -22,13 +22,13 @@ diff --git a/test/testdata/htdocs.expected/summary/keychain.html b/test/testdata/htdocs.expected/summary/keychain.html index 4a6fd02..a15fad4 100644 --- a/test/testdata/htdocs.expected/summary/keychain.html +++ b/test/testdata/htdocs.expected/summary/keychain.html @@ -30,11 +30,11 @@ necessary

    diff --git a/test/testdata/htdocs.expected/summary/libdns_sd-devel.html b/test/testdata/htdocs.expected/summary/libdns_sd-devel.html index 7cea685..1a309c9 100644 --- a/test/testdata/htdocs.expected/summary/libdns_sd-devel.html +++ b/test/testdata/htdocs.expected/summary/libdns_sd-devel.html @@ -24,8 +24,8 @@ industry standard IP protocols.

    • x86
      • - - + +
      VersionPackage SizeFiles
      379.32.1-10 kB[list of files]
      VersionPackage SizeFilesStatus
      379.32.1-10 kB[list of files]stable

    diff --git a/test/testdata/htdocs.expected/summary/libdns_sd1.html b/test/testdata/htdocs.expected/summary/libdns_sd1.html index 492fb70..40c926f 100644 --- a/test/testdata/htdocs.expected/summary/libdns_sd1.html +++ b/test/testdata/htdocs.expected/summary/libdns_sd1.html @@ -23,8 +23,8 @@ industry standard IP protocols.

    • x86
      • - - + +
      VersionPackage SizeFiles
      379.32.1-10 kB[list of files]
      VersionPackage SizeFilesStatus
      379.32.1-10 kB[list of files]stable

    diff --git a/test/testdata/htdocs.expected/summary/mDNSResponder.html b/test/testdata/htdocs.expected/summary/mDNSResponder.html index 8f454b4..49c3740 100644 --- a/test/testdata/htdocs.expected/summary/mDNSResponder.html +++ b/test/testdata/htdocs.expected/summary/mDNSResponder.html @@ -24,9 +24,9 @@ industry standard IP protocols.

    diff --git a/test/testdata/htdocs.expected/summary/obs-a.html b/test/testdata/htdocs.expected/summary/obs-a.html index 0d39aa6..e069b83 100644 --- a/test/testdata/htdocs.expected/summary/obs-a.html +++ b/test/testdata/htdocs.expected/summary/obs-a.html @@ -21,9 +21,9 @@ diff --git a/test/testdata/htdocs.expected/summary/obs-b.html b/test/testdata/htdocs.expected/summary/obs-b.html index 649a59d..0e9f2ae 100644 --- a/test/testdata/htdocs.expected/summary/obs-b.html +++ b/test/testdata/htdocs.expected/summary/obs-b.html @@ -21,9 +21,9 @@ diff --git a/test/testdata/htdocs.expected/summary/openssh.html b/test/testdata/htdocs.expected/summary/openssh.html index 73c64a1..67bc7e4 100644 --- a/test/testdata/htdocs.expected/summary/openssh.html +++ b/test/testdata/htdocs.expected/summary/openssh.html @@ -23,9 +23,9 @@ 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 b0025b5..679f572 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 @@ -22,9 +22,9 @@ diff --git a/test/testdata/htdocs.expected/summary/per-version.html b/test/testdata/htdocs.expected/summary/per-version.html index 155b5d1..286f867 100644 --- a/test/testdata/htdocs.expected/summary/per-version.html +++ b/test/testdata/htdocs.expected/summary/per-version.html @@ -22,11 +22,11 @@ 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 b9350d7..5464cc2 100644 --- a/test/testdata/htdocs.expected/summary/perl-Net-SMTP-SSL.html +++ b/test/testdata/htdocs.expected/summary/perl-Net-SMTP-SSL.html @@ -22,9 +22,9 @@ its network operations in order to support encrypted connections.

    diff --git a/test/testdata/htdocs.expected/summary/rpm-doc.html b/test/testdata/htdocs.expected/summary/rpm-doc.html index acd408a..a20b3d0 100644 --- a/test/testdata/htdocs.expected/summary/rpm-doc.html +++ b/test/testdata/htdocs.expected/summary/rpm-doc.html @@ -21,10 +21,10 @@ diff --git a/test/testdata/htdocs.expected/summary/staleversion.html b/test/testdata/htdocs.expected/summary/staleversion.html index 2d08ca4..5f336ff 100644 --- a/test/testdata/htdocs.expected/summary/staleversion.html +++ b/test/testdata/htdocs.expected/summary/staleversion.html @@ -21,19 +21,19 @@ diff --git a/test/testdata/htdocs.expected/summary/test-c.html b/test/testdata/htdocs.expected/summary/test-c.html index 7eb0d93..18fe254 100644 --- a/test/testdata/htdocs.expected/summary/test-c.html +++ b/test/testdata/htdocs.expected/summary/test-c.html @@ -23,9 +23,9 @@ diff --git a/test/testdata/htdocs.expected/summary/test-d.html b/test/testdata/htdocs.expected/summary/test-d.html index c9e7bba..0c6a0e0 100644 --- a/test/testdata/htdocs.expected/summary/test-d.html +++ b/test/testdata/htdocs.expected/summary/test-d.html @@ -21,9 +21,9 @@ diff --git a/test/testdata/htdocs.expected/summary/test-e.html b/test/testdata/htdocs.expected/summary/test-e.html index 9fa5cf1..e7a30fc 100644 --- a/test/testdata/htdocs.expected/summary/test-e.html +++ b/test/testdata/htdocs.expected/summary/test-e.html @@ -22,9 +22,9 @@ diff --git a/test/testdata/htdocs.expected/summary/testpackage.html b/test/testdata/htdocs.expected/summary/testpackage.html index dd1a902..acc6098 100644 --- a/test/testdata/htdocs.expected/summary/testpackage.html +++ b/test/testdata/htdocs.expected/summary/testpackage.html @@ -21,9 +21,9 @@ diff --git a/test/testdata/htdocs.expected/x86/arc/.htaccess b/test/testdata/htdocs.expected/x86/arc/.htaccess index 3196d64..459b359 100644 --- a/test/testdata/htdocs.expected/x86/arc/.htaccess +++ b/test/testdata/htdocs.expected/x86/arc/.htaccess @@ -1,3 +1 @@ -Options Indexes -IndexOptions -FancyIndexing -AddType text/html 1 2 3 4 5 6 7 8 9 +Redirect 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 3196d64..9a36f3a 100644 --- a/test/testdata/htdocs.expected/x86/base-cygwin/.htaccess +++ b/test/testdata/htdocs.expected/x86/base-cygwin/.htaccess @@ -1,3 +1 @@ -Options Indexes -IndexOptions -FancyIndexing -AddType text/html 1 2 3 4 5 6 7 8 9 +Redirect 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 3196d64..d5e6209 100644 --- a/test/testdata/htdocs.expected/x86/corrupt/.htaccess +++ b/test/testdata/htdocs.expected/x86/corrupt/.htaccess @@ -1,3 +1 @@ -Options Indexes -IndexOptions -FancyIndexing -AddType text/html 1 2 3 4 5 6 7 8 9 +Redirect 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 3196d64..9e500d7 100644 --- a/test/testdata/htdocs.expected/x86/cygwin-debuginfo/.htaccess +++ b/test/testdata/htdocs.expected/x86/cygwin-debuginfo/.htaccess @@ -1,3 +1 @@ -Options Indexes -IndexOptions -FancyIndexing -AddType text/html 1 2 3 4 5 6 7 8 9 +Redirect 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 3196d64..0302567 100644 --- a/test/testdata/htdocs.expected/x86/cygwin-devel/.htaccess +++ b/test/testdata/htdocs.expected/x86/cygwin-devel/.htaccess @@ -1,3 +1 @@ -Options Indexes -IndexOptions -FancyIndexing -AddType text/html 1 2 3 4 5 6 7 8 9 +Redirect 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 3196d64..4ae3f05 100644 --- a/test/testdata/htdocs.expected/x86/cygwin/.htaccess +++ b/test/testdata/htdocs.expected/x86/cygwin/.htaccess @@ -1,3 +1 @@ -Options Indexes -IndexOptions -FancyIndexing -AddType text/html 1 2 3 4 5 6 7 8 9 +Redirect 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 3196d64..8168f3a 100644 --- a/test/testdata/htdocs.expected/x86/keychain/.htaccess +++ b/test/testdata/htdocs.expected/x86/keychain/.htaccess @@ -1,3 +1 @@ -Options Indexes -IndexOptions -FancyIndexing -AddType text/html 1 2 3 4 5 6 7 8 9 +Redirect 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 3196d64..b319667 100644 --- a/test/testdata/htdocs.expected/x86/libdns_sd-devel/.htaccess +++ b/test/testdata/htdocs.expected/x86/libdns_sd-devel/.htaccess @@ -1,3 +1 @@ -Options Indexes -IndexOptions -FancyIndexing -AddType text/html 1 2 3 4 5 6 7 8 9 +Redirect 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 3196d64..c315409 100644 --- a/test/testdata/htdocs.expected/x86/libdns_sd1/.htaccess +++ b/test/testdata/htdocs.expected/x86/libdns_sd1/.htaccess @@ -1,3 +1 @@ -Options Indexes -IndexOptions -FancyIndexing -AddType text/html 1 2 3 4 5 6 7 8 9 +Redirect 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 3196d64..a16a16b 100644 --- a/test/testdata/htdocs.expected/x86/mDNSResponder/.htaccess +++ b/test/testdata/htdocs.expected/x86/mDNSResponder/.htaccess @@ -1,3 +1 @@ -Options Indexes -IndexOptions -FancyIndexing -AddType text/html 1 2 3 4 5 6 7 8 9 +Redirect 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 3196d64..253da20 100644 --- a/test/testdata/htdocs.expected/x86/obs-a/.htaccess +++ b/test/testdata/htdocs.expected/x86/obs-a/.htaccess @@ -1,3 +1 @@ -Options Indexes -IndexOptions -FancyIndexing -AddType text/html 1 2 3 4 5 6 7 8 9 +Redirect 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 3196d64..dd94c2a 100644 --- a/test/testdata/htdocs.expected/x86/obs-b/.htaccess +++ b/test/testdata/htdocs.expected/x86/obs-b/.htaccess @@ -1,3 +1 @@ -Options Indexes -IndexOptions -FancyIndexing -AddType text/html 1 2 3 4 5 6 7 8 9 +Redirect 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 3196d64..032315c 100644 --- a/test/testdata/htdocs.expected/x86/openssh/.htaccess +++ b/test/testdata/htdocs.expected/x86/openssh/.htaccess @@ -1,3 +1 @@ -Options Indexes -IndexOptions -FancyIndexing -AddType text/html 1 2 3 4 5 6 7 8 9 +Redirect 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 3196d64..8b5f52f 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,3 +1 @@ -Options Indexes -IndexOptions -FancyIndexing -AddType text/html 1 2 3 4 5 6 7 8 9 +Redirect 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 3196d64..9979909 100644 --- a/test/testdata/htdocs.expected/x86/per-version/.htaccess +++ b/test/testdata/htdocs.expected/x86/per-version/.htaccess @@ -1,3 +1 @@ -Options Indexes -IndexOptions -FancyIndexing -AddType text/html 1 2 3 4 5 6 7 8 9 +Redirect 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 3196d64..f8bcf57 100644 --- a/test/testdata/htdocs.expected/x86/perl-Net-SMTP-SSL/.htaccess +++ b/test/testdata/htdocs.expected/x86/perl-Net-SMTP-SSL/.htaccess @@ -1,3 +1 @@ -Options Indexes -IndexOptions -FancyIndexing -AddType text/html 1 2 3 4 5 6 7 8 9 +Redirect 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 3196d64..1bff57d 100644 --- a/test/testdata/htdocs.expected/x86/rpm-doc/.htaccess +++ b/test/testdata/htdocs.expected/x86/rpm-doc/.htaccess @@ -1,3 +1 @@ -Options Indexes -IndexOptions -FancyIndexing -AddType text/html 1 2 3 4 5 6 7 8 9 +Redirect 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 3196d64..14383a7 100644 --- a/test/testdata/htdocs.expected/x86/staleversion/.htaccess +++ b/test/testdata/htdocs.expected/x86/staleversion/.htaccess @@ -1,3 +1 @@ -Options Indexes -IndexOptions -FancyIndexing -AddType text/html 1 2 3 4 5 6 7 8 9 +Redirect 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 3196d64..1d92888 100644 --- a/test/testdata/htdocs.expected/x86/test-c/.htaccess +++ b/test/testdata/htdocs.expected/x86/test-c/.htaccess @@ -1,3 +1 @@ -Options Indexes -IndexOptions -FancyIndexing -AddType text/html 1 2 3 4 5 6 7 8 9 +Redirect 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 3196d64..d427219 100644 --- a/test/testdata/htdocs.expected/x86/test-d/.htaccess +++ b/test/testdata/htdocs.expected/x86/test-d/.htaccess @@ -1,3 +1 @@ -Options Indexes -IndexOptions -FancyIndexing -AddType text/html 1 2 3 4 5 6 7 8 9 +Redirect 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 3196d64..3ad2e69 100644 --- a/test/testdata/htdocs.expected/x86/test-e/.htaccess +++ b/test/testdata/htdocs.expected/x86/test-e/.htaccess @@ -1,3 +1 @@ -Options Indexes -IndexOptions -FancyIndexing -AddType text/html 1 2 3 4 5 6 7 8 9 +Redirect 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 3196d64..cc3711a 100644 --- a/test/testdata/htdocs.expected/x86/testpackage/.htaccess +++ b/test/testdata/htdocs.expected/x86/testpackage/.htaccess @@ -1,3 +1 @@ -Options Indexes -IndexOptions -FancyIndexing -AddType text/html 1 2 3 4 5 6 7 8 9 +Redirect temp /packages/x86/testpackage/ /packages/summary/testpackage.html