From 7d179dd405700226e0b923eae78ff998156bd679 Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Thu, 6 Jul 2017 23:12:30 +0300 Subject: [PATCH] Small fixups for upcoming 1.1.0 release Fix system tests, add -db-open-attempts to bash completion, small nits for man page. --- bash_completion.d/aptly | 2 +- man/aptly.1 | 4 ++++ man/aptly.1.ronn.tmpl | 3 +++ system/t06_publish/S3Publish3Test_gold | 2 +- system/t06_publish/S3Publish3Test_release | 2 +- system/t06_publish/SwiftPublish3Test_gold | 2 +- system/t06_publish/SwiftPublish3Test_release | 2 +- 7 files changed, 12 insertions(+), 5 deletions(-) diff --git a/bash_completion.d/aptly b/bash_completion.d/aptly index 827e4d4b..ed180460 100644 --- a/bash_completion.d/aptly +++ b/bash_completion.d/aptly @@ -58,7 +58,7 @@ _aptly() prev="${COMP_WORDS[COMP_CWORD-1]}" commands="api config db graph mirror package publish repo serve snapshot task version" - options="-architectures= -config= -dep-follow-all-variants -dep-follow-recommends -dep-follow-source -dep-follow-suggests -dep-verbose-resolve" + options="-architectures= -config= -db-open-attempts= -dep-follow-all-variants -dep-follow-recommends -dep-follow-source -dep-follow-suggests -dep-verbose-resolve" db_subcommands="cleanup recover" mirror_subcommands="create drop edit show list rename search update" diff --git a/man/aptly.1 b/man/aptly.1 index 86e8ffe2..06d66eb3 100644 --- a/man/aptly.1 +++ b/man/aptly.1 @@ -160,6 +160,10 @@ in aptly up to version 1\.0\.0, package files were stored in internal package po specifies paramaters for short PPA url expansion, if left blank they default to output of \fBlsb_release\fR command . .TP +\fBFileSystemPublishEndpoints\fR +configuration of local filesystem publishing endpoints (see below) +. +.TP \fBS3PublishEndpoints\fR configuration of Amazon S3 publishing endpoints (see below) . diff --git a/man/aptly.1.ronn.tmpl b/man/aptly.1.ronn.tmpl index e1825b05..ae02755a 100644 --- a/man/aptly.1.ronn.tmpl +++ b/man/aptly.1.ronn.tmpl @@ -142,6 +142,9 @@ Options: specifies paramaters for short PPA url expansion, if left blank they default to output of `lsb_release` command + * `FileSystemPublishEndpoints`: + configuration of local filesystem publishing endpoints (see below) + * `S3PublishEndpoints`: configuration of Amazon S3 publishing endpoints (see below) diff --git a/system/t06_publish/S3Publish3Test_gold b/system/t06_publish/S3Publish3Test_gold index b6fc6fce..7d609f0f 100644 --- a/system/t06_publish/S3Publish3Test_gold +++ b/system/t06_publish/S3Publish3Test_gold @@ -5,4 +5,4 @@ Signing file 'Release' with gpg, please enter your passphrase when prompted: Clearsigning file 'Release' with gpg, please enter your passphrase when prompted: Cleaning up prefix "." components main... -Publish for snapshot s3:test1:./maverick [amd64, i386] publishes {main: [snap3]: Pulled into 'snap2' with 'snap1' as source, pull request was: 'gnuplot-x11'} has been successfully switched to new snapshot. +Publish for snapshot s3:test1:./maverick (origin: LP-PPA-gladky-anton-gnuplot) [amd64, i386] publishes {main: [snap3]: Pulled into 'snap2' with 'snap1' as source, pull request was: 'gnuplot-x11'} has been successfully switched to new snapshot. diff --git a/system/t06_publish/S3Publish3Test_release b/system/t06_publish/S3Publish3Test_release index 3d749ff5..91ff3759 100644 --- a/system/t06_publish/S3Publish3Test_release +++ b/system/t06_publish/S3Publish3Test_release @@ -1,4 +1,4 @@ -Origin: . maverick +Origin: LP-PPA-gladky-anton-gnuplot Label: . maverick Suite: maverick Codename: maverick diff --git a/system/t06_publish/SwiftPublish3Test_gold b/system/t06_publish/SwiftPublish3Test_gold index 4b493d05..16c322a5 100644 --- a/system/t06_publish/SwiftPublish3Test_gold +++ b/system/t06_publish/SwiftPublish3Test_gold @@ -5,4 +5,4 @@ Signing file 'Release' with gpg, please enter your passphrase when prompted: Clearsigning file 'Release' with gpg, please enter your passphrase when prompted: Cleaning up prefix "." components main... -Publish for snapshot swift:test1:./maverick [amd64, i386] publishes {main: [snap3]: Pulled into 'snap2' with 'snap1' as source, pull request was: 'gnuplot-x11'} has been successfully switched to new snapshot. +Publish for snapshot swift:test1:./maverick (origin: LP-PPA-gladky-anton-gnuplot) [amd64, i386] publishes {main: [snap3]: Pulled into 'snap2' with 'snap1' as source, pull request was: 'gnuplot-x11'} has been successfully switched to new snapshot. diff --git a/system/t06_publish/SwiftPublish3Test_release b/system/t06_publish/SwiftPublish3Test_release index 3d749ff5..91ff3759 100644 --- a/system/t06_publish/SwiftPublish3Test_release +++ b/system/t06_publish/SwiftPublish3Test_release @@ -1,4 +1,4 @@ -Origin: . maverick +Origin: LP-PPA-gladky-anton-gnuplot Label: . maverick Suite: maverick Codename: maverick