diff --git a/Gopkg.lock b/Gopkg.lock index 85f82765..10b6def3 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -117,7 +117,7 @@ memo = "becdf010a814559719c990c1bd645c737cee332ad52004c440605c13de100d45" branch = "master" name = "github.com/smira/flag" packages = ["."] - revision = "357ed3e599ffcbd4aeaa828e1d10da2df3ea5107" + revision = "695ea5e84e76dea7c8656e43c384e54b32aa1b2a" [[projects]] branch = "master" diff --git a/man/aptly.1 b/man/aptly.1 index 99907e61..179aa667 100644 --- a/man/aptly.1 +++ b/man/aptly.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "APTLY" "1" "July 2017" "" "" +.TH "APTLY" "1" "September 2017" "" "" . .SH "NAME" \fBaptly\fR \- Debian repository management tool @@ -413,23 +413,23 @@ location of configuration file (default locations are /etc/aptly\.conf, ~/\.aptl number of attempts to open DB if it\(cqs locked by other instance . .TP -\-\fBdep\-follow\-all\-variants\fR=false +\-\fBdep\-follow\-all\-variants\fR when processing dependencies, follow a & b if dependency is \(cqa|b\(cq . .TP -\-\fBdep\-follow\-recommends\fR=false +\-\fBdep\-follow\-recommends\fR when processing dependencies, follow Recommends . .TP -\-\fBdep\-follow\-source\fR=false +\-\fBdep\-follow\-source\fR when processing dependencies, follow from binary to Source packages . .TP -\-\fBdep\-follow\-suggests\fR=false +\-\fBdep\-follow\-suggests\fR when processing dependencies, follow Suggests . .TP -\-\fBdep\-verbose\-resolve\fR=false +\-\fBdep\-verbose\-resolve\fR when processing dependencies, print detailed logs . .TP @@ -462,19 +462,19 @@ Options: filter packages in mirror . .TP -\-\fBfilter\-with\-deps\fR=false +\-\fBfilter\-with\-deps\fR when filtering, include dependencies of matching packages as well . .TP -\-\fBforce\-architectures\fR=false +\-\fBforce\-architectures\fR (only with architecture list) skip check that requested architectures are listed in Release file . .TP -\-\fBforce\-components\fR=false +\-\fBforce\-components\fR (only with component list) skip check that requested components are listed in Release file . .TP -\-\fBignore\-signatures\fR=false +\-\fBignore\-signatures\fR disable verification of Release file signatures . .TP @@ -482,11 +482,11 @@ disable verification of Release file signatures gpg keyring to use when verifying Release file (could be specified multiple times) . .TP -\-\fBwith\-sources\fR=false +\-\fBwith\-sources\fR download source packages in addition to binary packages . .TP -\-\fBwith\-udebs\fR=false +\-\fBwith\-udebs\fR download \.udeb packages (Debian installer support) . .SH "LIST MIRRORS" @@ -505,7 +505,7 @@ $ aptly mirror list Options: . .TP -\-\fBraw\fR=false +\-\fBraw\fR display list in machine\-readable format . .SH "SHOW DETAILS ABOUT MIRROR" @@ -524,7 +524,7 @@ $ aptly mirror show wheezy\-main Options: . .TP -\-\fBwith\-packages\fR=false +\-\fBwith\-packages\fR show detailed list of packages and versions stored in the mirror . .SH "DELETE MIRROR" @@ -543,7 +543,7 @@ $ aptly mirror drop wheezy\-main Options: . .TP -\-\fBforce\fR=false +\-\fBforce\fR force mirror deletion even if used by snapshots . .SH "UPDATE MIRROR" @@ -566,15 +566,15 @@ Options: limit download speed (kbytes/sec) . .TP -\-\fBforce\fR=false +\-\fBforce\fR force update mirror even if it is locked by another process . .TP -\-\fBignore\-checksums\fR=false +\-\fBignore\-checksums\fR ignore checksum mismatches while downloading package files and metadata . .TP -\-\fBignore\-signatures\fR=false +\-\fBignore\-signatures\fR disable verification of Release file signatures . .TP @@ -586,7 +586,7 @@ gpg keyring to use when verifying Release file (could be specified multiple time max download tries till process fails with download error . .TP -\-\fBskip\-existing\-packages\fR=false +\-\fBskip\-existing\-packages\fR do not check file existence for packages listed in the internal database of the mirror . .SH "RENAMES MIRROR" @@ -621,15 +621,15 @@ Options: filter packages in mirror . .TP -\-\fBfilter\-with\-deps\fR=false +\-\fBfilter\-with\-deps\fR when filtering, include dependencies of matching packages as well . .TP -\-\fBwith\-sources\fR=false +\-\fBwith\-sources\fR download source packages in addition to binary packages . .TP -\-\fBwith\-udebs\fR=false +\-\fBwith\-udebs\fR download \.udeb packages (Debian installer support) . .SH "SEARCH MIRROR FOR PACKAGES MATCHING QUERY" @@ -662,7 +662,7 @@ Options: custom format for result printing . .TP -\-\fBwith\-deps\fR=false +\-\fBwith\-deps\fR include dependencies into search results . .SH "ADD PACKAGES TO LOCAL REPOSITORY" @@ -681,11 +681,11 @@ $ aptly repo add testing myapp\-0\.1\.2\.deb incoming/ Options: . .TP -\-\fBforce\-replace\fR=false +\-\fBforce\-replace\fR when adding package that conflicts with existing package, remove existing package . .TP -\-\fBremove\-files\fR=false +\-\fBremove\-files\fR remove files that have been imported successfully into repository . .SH "COPY PACKAGES BETWEEN LOCAL REPOSITORIES" @@ -704,11 +704,11 @@ $ aptly repo copy testing stable \(cqmyapp (=0\.1\.12)\(cq Options: . .TP -\-\fBdry\-run\fR=false +\-\fBdry\-run\fR don\(cqt copy, just show what would be copied . .TP -\-\fBwith\-deps\fR=false +\-\fBwith\-deps\fR follow dependencies when processing package\-spec . .SH "CREATE LOCAL REPOSITORY" @@ -764,7 +764,7 @@ $ aptly repo drop local\-repo Options: . .TP -\-\fBforce\fR=false +\-\fBforce\fR force local repo deletion even if used by snapshots . .SH "EDIT PROPERTIES OF LOCAL REPOSITORY" @@ -814,11 +814,11 @@ $ aptly repo import wheezy\-main testing nginx Options: . .TP -\-\fBdry\-run\fR=false +\-\fBdry\-run\fR don\(cqt import, just show what would be imported . .TP -\-\fBwith\-deps\fR=false +\-\fBwith\-deps\fR follow dependencies when processing package\-spec . .SH "LIST LOCAL REPOSITORIES" @@ -837,7 +837,7 @@ $ aptly repo list Options: . .TP -\-\fBraw\fR=false +\-\fBraw\fR display list in machine\-readable format . .SH "MOVE PACKAGES BETWEEN LOCAL REPOSITORIES" @@ -856,11 +856,11 @@ $ aptly repo move testing stable \(cqmyapp (=0\.1\.12)\(cq Options: . .TP -\-\fBdry\-run\fR=false +\-\fBdry\-run\fR don\(cqt move, just show what would be moved . .TP -\-\fBwith\-deps\fR=false +\-\fBwith\-deps\fR follow dependencies when processing package\-spec . .SH "REMOVE PACKAGES FROM LOCAL REPOSITORY" @@ -879,7 +879,7 @@ $ aptly repo remove testing \(cqmyapp (=0\.1\.12)\(cq Options: . .TP -\-\fBdry\-run\fR=false +\-\fBdry\-run\fR don\(cqt remove, just show what would be removed . .SH "SHOW DETAILS ABOUT LOCAL REPOSITORY" @@ -895,7 +895,7 @@ ex: $ aptly repo show testing Options: . .TP -\-\fBwith\-packages\fR=false +\-\fBwith\-packages\fR show list of packages . .SH "RENAMES LOCAL REPOSITORY" @@ -940,7 +940,7 @@ Options: custom format for result printing . .TP -\-\fBwith\-deps\fR=false +\-\fBwith\-deps\fR include dependencies into search results . .SH "ADD PACKAGES TO LOCAL REPOSITORIES BASED ON \.CHANGES FILES" @@ -962,15 +962,15 @@ $ aptly repo include \-repo=foo\-release incoming/ Options: . .TP -\-\fBaccept\-unsigned\fR=false +\-\fBaccept\-unsigned\fR accept unsigned \.changes files . .TP -\-\fBforce\-replace\fR=false +\-\fBforce\-replace\fR when adding package that conflicts with existing package, remove existing package . .TP -\-\fBignore\-signatures\fR=false +\-\fBignore\-signatures\fR disable verification of \.changes file signature . .TP @@ -978,7 +978,7 @@ disable verification of \.changes file signature gpg keyring to use when verifying Release file (could be specified multiple times) . .TP -\-\fBno\-remove\-files\fR=false +\-\fBno\-remove\-files\fR don\(cqt remove files that have been imported successfully into repository . .TP @@ -1023,7 +1023,7 @@ $ aptly snapshot list Options: . .TP -\-\fBraw\fR=false +\-\fBraw\fR display list in machine\-readable format . .TP @@ -1053,7 +1053,7 @@ $ aptly snapshot show wheezy\-main Options: . .TP -\-\fBwith\-packages\fR=false +\-\fBwith\-packages\fR show list of packages . .SH "VERIFY DEPENDENCIES IN SNAPSHOT" @@ -1098,19 +1098,19 @@ $ aptly snapshot pull wheezy\-main wheezy\-backports wheezy\-new\-xorg xorg\-ser Options: . .TP -\-\fBall\-matches\fR=false +\-\fBall\-matches\fR pull all the packages that satisfy the dependency version requirements . .TP -\-\fBdry\-run\fR=false +\-\fBdry\-run\fR don\(cqt create destination snapshot, just show what would be pulled . .TP -\-\fBno\-deps\fR=false +\-\fBno\-deps\fR don\(cqt process dependencies, just pull listed packages . .TP -\-\fBno\-remove\fR=false +\-\fBno\-remove\fR don\(cqt remove other package versions when pulling package . .SH "DIFFERENCE BETWEEN TWO SNAPSHOTS" @@ -1136,7 +1136,7 @@ $ aptly snapshot diff \-only\-matching wheezy\-main wheezy\-backports Options: . .TP -\-\fBonly\-matching\fR=false +\-\fBonly\-matching\fR display diff only for matching packages (don\(cqt display missing packages) . .SH "MERGES SNAPSHOTS" @@ -1162,11 +1162,11 @@ $ aptly snapshot merge wheezy\-w\-backports wheezy\-main wheezy\-backports Options: . .TP -\-\fBlatest\fR=false +\-\fBlatest\fR use only the latest version of each package . .TP -\-\fBno\-remove\fR=false +\-\fBno\-remove\fR don\(cqt remove duplicate arch/name packages . .SH "DELETE SNAPSHOT" @@ -1192,7 +1192,7 @@ $ aptly snapshot drop wheezy\-main Options: . .TP -\-\fBforce\fR=false +\-\fBforce\fR remove snapshot even if it was used as source for other snapshots . .SH "RENAMES SNAPSHOT" @@ -1237,7 +1237,7 @@ Options: custom format for result printing . .TP -\-\fBwith\-deps\fR=false +\-\fBwith\-deps\fR include dependencies into search results . .SH "FILTER PACKAGES IN SNAPSHOT PRODUCING ANOTHER SNAPSHOT" @@ -1263,7 +1263,7 @@ $ aptly snapshot filter wheezy\-main wheezy\-required \(cqPriorioty (required)\( Options: . .TP -\-\fBwith\-deps\fR=false +\-\fBwith\-deps\fR include dependent packages as well . .SH "REMOVE PUBLISHED REPOSITORY" @@ -1289,9 +1289,13 @@ $ aptly publish drop wheezy Options: . .TP -\-\fBforce\-drop\fR=false +\-\fBforce\-drop\fR remove published repository even if some files could not be cleaned up . +.TP +\-\fBskip\-cleanup\fR +don\(cqt remove unreferenced files in prefix/component +. .SH "LIST OF PUBLISHED REPOSITORIES" \fBaptly\fR \fBpublish\fR \fBlist\fR . @@ -1315,7 +1319,7 @@ $ aptly publish list Options: . .TP -\-\fBraw\fR=false +\-\fBraw\fR display list in machine\-readable format . .SH "PUBLISH LOCAL REPOSITORY" @@ -1357,7 +1361,7 @@ $ aptly publish repo testing Options: . .TP -\-\fBbatch\fR=false +\-\fBbatch\fR run GPG with detached tty . .TP @@ -1373,7 +1377,7 @@ component name to publish (for multi\-component publishing, separate components distribution name to publish . .TP -\-\fBforce\-overwrite\fR=false +\-\fBforce\-overwrite\fR overwrite files in package pool in case of mismatch . .TP @@ -1409,11 +1413,11 @@ GPG passhprase\-file for the key (warning: could be insecure) GPG secret keyring to use (instead of default) . .TP -\-\fBskip\-contents\fR=false +\-\fBskip\-contents\fR don\(cqt generate Contents indexes . .TP -\-\fBskip\-signing\fR=false +\-\fBskip\-signing\fR don\(cqt sign Release files with GPG . .SH "PUBLISH SNAPSHOT" @@ -1452,7 +1456,7 @@ $ aptly publish snapshot wheezy\-main Options: . .TP -\-\fBbatch\fR=false +\-\fBbatch\fR run GPG with detached tty . .TP @@ -1468,7 +1472,7 @@ component name to publish (for multi\-component publishing, separate components distribution name to publish . .TP -\-\fBforce\-overwrite\fR=false +\-\fBforce\-overwrite\fR overwrite files in package pool in case of mismatch . .TP @@ -1504,11 +1508,11 @@ GPG passhprase\-file for the key (warning: could be insecure) GPG secret keyring to use (instead of default) . .TP -\-\fBskip\-contents\fR=false +\-\fBskip\-contents\fR don\(cqt generate Contents indexes . .TP -\-\fBskip\-signing\fR=false +\-\fBskip\-signing\fR don\(cqt sign Release files with GPG . .SH "UPDATE PUBLISHED REPOSITORY BY SWITCHING TO NEW SNAPSHOT" @@ -1550,7 +1554,7 @@ This command would switch published repository (with one component) named ppa/wh Options: . .TP -\-\fBbatch\fR=false +\-\fBbatch\fR run GPG with detached tty . .TP @@ -1558,7 +1562,7 @@ run GPG with detached tty component names to update (for multi\-component publishing, separate components with commas) . .TP -\-\fBforce\-overwrite\fR=false +\-\fBforce\-overwrite\fR overwrite files in package pool in case of mismatch . .TP @@ -1582,11 +1586,15 @@ GPG passhprase\-file for the key (warning: could be insecure) GPG secret keyring to use (instead of default) . .TP -\-\fBskip\-contents\fR=false +\-\fBskip\-cleanup\fR +don\(cqt remove unreferenced files in prefix/component +. +.TP +\-\fBskip\-contents\fR don\(cqt generate Contents indexes . .TP -\-\fBskip\-signing\fR=false +\-\fBskip\-signing\fR don\(cqt sign Release files with GPG . .SH "UPDATE PUBLISHED LOCAL REPOSITORY" @@ -1615,11 +1623,11 @@ $ aptly publish update wheezy ppa Options: . .TP -\-\fBbatch\fR=false +\-\fBbatch\fR run GPG with detached tty . .TP -\-\fBforce\-overwrite\fR=false +\-\fBforce\-overwrite\fR overwrite files in package pool in case of mismatch . .TP @@ -1643,11 +1651,15 @@ GPG passhprase\-file for the key (warning: could be insecure) GPG secret keyring to use (instead of default) . .TP -\-\fBskip\-contents\fR=false +\-\fBskip\-cleanup\fR +don\(cqt remove unreferenced files in prefix/component +. +.TP +\-\fBskip\-contents\fR don\(cqt generate Contents indexes . .TP -\-\fBskip\-signing\fR=false +\-\fBskip\-signing\fR don\(cqt sign Release files with GPG . .SH "SHOWS DETAILS OF PUBLISHED REPOSITORY" @@ -1721,11 +1733,11 @@ $ aptly package show \(cqnginx\-light_1\.2\.1\-2\.2+wheezy2_i386\(cq Options: . .TP -\-\fBwith\-files\fR=false +\-\fBwith\-files\fR display information about files from package pool . .TP -\-\fBwith\-references\fR=false +\-\fBwith\-references\fR display information about mirrors, snapshots and local repos referencing this package . .SH "CLEANUP DB AND PACKAGE POOL" @@ -1744,11 +1756,11 @@ $ aptly db cleanup Options: . .TP -\-\fBdry\-run\fR=false +\-\fBdry\-run\fR don\(cqt delete anything . .TP -\-\fBverbose\fR=false +\-\fBverbose\fR be verbose when loading objects/removing them . .SH "RECOVER DB AFTER CRASH" @@ -1802,7 +1814,7 @@ Options: host:port for HTTP listening or unix://path to listen on a Unix domain socket . .TP -\-\fBno\-lock\fR=false +\-\fBno\-lock\fR don\(cqt lock the database . .SH "RENDER GRAPH OF RELATIONSHIPS" @@ -1992,4 +2004,11 @@ Clemens Rabe (https://github\.com/seeraven) .IP "\[ci]" 4 TJ Merritt (https://github\.com/tjmerritt) . +.IP "\[ci]" 4 +Matt Martyn (https://github\.com/MMartyn) +. +.IP "\[ci]" 4 +Ludovico Cavedon (https://github\.com/cavedon) +. .IP "" 0 + diff --git a/man/aptly.1.ronn.tmpl b/man/aptly.1.ronn.tmpl index 8c2d0bc1..b640d9d8 100644 --- a/man/aptly.1.ronn.tmpl +++ b/man/aptly.1.ronn.tmpl @@ -440,7 +440,7 @@ Options: {{/* options layout */}} {{define "options"}} {{range allFlags .Flag}} - * -`{{.Name}}`={{.DefValue}}: + * -`{{.Name}}`{{if ne .DefValue "false"}}={{.DefValue}}{{end}}: {{.Usage}} {{end}} {{end}} diff --git a/system/t03_help/MainHelpTest_gold b/system/t03_help/MainHelpTest_gold index e1726e93..6fcd5eb7 100644 --- a/system/t03_help/MainHelpTest_gold +++ b/system/t03_help/MainHelpTest_gold @@ -14,10 +14,10 @@ Options: -architectures="": list of architectures to consider during (comma-separated), default to all available -config="": location of configuration file (default locations are /etc/aptly.conf, ~/.aptly.conf) -db-open-attempts=10: number of attempts to open DB if it's locked by other instance - -dep-follow-all-variants=false: when processing dependencies, follow a & b if dependency is 'a|b' - -dep-follow-recommends=false: when processing dependencies, follow Recommends - -dep-follow-source=false: when processing dependencies, follow from binary to Source packages - -dep-follow-suggests=false: when processing dependencies, follow Suggests - -dep-verbose-resolve=false: when processing dependencies, print detailed logs + -dep-follow-all-variants: when processing dependencies, follow a & b if dependency is 'a|b' + -dep-follow-recommends: when processing dependencies, follow Recommends + -dep-follow-source: when processing dependencies, follow from binary to Source packages + -dep-follow-suggests: when processing dependencies, follow Suggests + -dep-verbose-resolve: when processing dependencies, print detailed logs -gpg-provider="": PGP implementation ("gpg" for external gpg or "internal" for Go internal implementation) diff --git a/system/t03_help/MainTest_gold b/system/t03_help/MainTest_gold index f7be5bd7..e7efbc93 100644 --- a/system/t03_help/MainTest_gold +++ b/system/t03_help/MainTest_gold @@ -22,10 +22,10 @@ Options: -architectures="": list of architectures to consider during (comma-separated), default to all available -config="": location of configuration file (default locations are /etc/aptly.conf, ~/.aptly.conf) -db-open-attempts=10: number of attempts to open DB if it's locked by other instance - -dep-follow-all-variants=false: when processing dependencies, follow a & b if dependency is 'a|b' - -dep-follow-recommends=false: when processing dependencies, follow Recommends - -dep-follow-source=false: when processing dependencies, follow from binary to Source packages - -dep-follow-suggests=false: when processing dependencies, follow Suggests - -dep-verbose-resolve=false: when processing dependencies, print detailed logs + -dep-follow-all-variants: when processing dependencies, follow a & b if dependency is 'a|b' + -dep-follow-recommends: when processing dependencies, follow Recommends + -dep-follow-source: when processing dependencies, follow from binary to Source packages + -dep-follow-suggests: when processing dependencies, follow Suggests + -dep-verbose-resolve: when processing dependencies, print detailed logs -gpg-provider="": PGP implementation ("gpg" for external gpg or "internal" for Go internal implementation) ERROR: unable to parse command diff --git a/system/t03_help/MirrorCreateHelpTest_gold b/system/t03_help/MirrorCreateHelpTest_gold index bcf6b3b7..8830ee1e 100644 --- a/system/t03_help/MirrorCreateHelpTest_gold +++ b/system/t03_help/MirrorCreateHelpTest_gold @@ -16,18 +16,18 @@ Options: -architectures="": list of architectures to consider during (comma-separated), default to all available -config="": location of configuration file (default locations are /etc/aptly.conf, ~/.aptly.conf) -db-open-attempts=10: number of attempts to open DB if it's locked by other instance - -dep-follow-all-variants=false: when processing dependencies, follow a & b if dependency is 'a|b' - -dep-follow-recommends=false: when processing dependencies, follow Recommends - -dep-follow-source=false: when processing dependencies, follow from binary to Source packages - -dep-follow-suggests=false: when processing dependencies, follow Suggests - -dep-verbose-resolve=false: when processing dependencies, print detailed logs + -dep-follow-all-variants: when processing dependencies, follow a & b if dependency is 'a|b' + -dep-follow-recommends: when processing dependencies, follow Recommends + -dep-follow-source: when processing dependencies, follow from binary to Source packages + -dep-follow-suggests: when processing dependencies, follow Suggests + -dep-verbose-resolve: when processing dependencies, print detailed logs -filter="": filter packages in mirror - -filter-with-deps=false: when filtering, include dependencies of matching packages as well - -force-architectures=false: (only with architecture list) skip check that requested architectures are listed in Release file - -force-components=false: (only with component list) skip check that requested components are listed in Release file + -filter-with-deps: when filtering, include dependencies of matching packages as well + -force-architectures: (only with architecture list) skip check that requested architectures are listed in Release file + -force-components: (only with component list) skip check that requested components are listed in Release file -gpg-provider="": PGP implementation ("gpg" for external gpg or "internal" for Go internal implementation) - -ignore-signatures=false: disable verification of Release file signatures + -ignore-signatures: disable verification of Release file signatures -keyring=: gpg keyring to use when verifying Release file (could be specified multiple times) - -with-sources=false: download source packages in addition to binary packages - -with-udebs=false: download .udeb packages (Debian installer support) + -with-sources: download source packages in addition to binary packages + -with-udebs: download .udeb packages (Debian installer support) diff --git a/system/t03_help/MirrorCreateTest_gold b/system/t03_help/MirrorCreateTest_gold index e96e9354..ced80808 100644 --- a/system/t03_help/MirrorCreateTest_gold +++ b/system/t03_help/MirrorCreateTest_gold @@ -7,18 +7,18 @@ Options: -architectures="": list of architectures to consider during (comma-separated), default to all available -config="": location of configuration file (default locations are /etc/aptly.conf, ~/.aptly.conf) -db-open-attempts=10: number of attempts to open DB if it's locked by other instance - -dep-follow-all-variants=false: when processing dependencies, follow a & b if dependency is 'a|b' - -dep-follow-recommends=false: when processing dependencies, follow Recommends - -dep-follow-source=false: when processing dependencies, follow from binary to Source packages - -dep-follow-suggests=false: when processing dependencies, follow Suggests - -dep-verbose-resolve=false: when processing dependencies, print detailed logs + -dep-follow-all-variants: when processing dependencies, follow a & b if dependency is 'a|b' + -dep-follow-recommends: when processing dependencies, follow Recommends + -dep-follow-source: when processing dependencies, follow from binary to Source packages + -dep-follow-suggests: when processing dependencies, follow Suggests + -dep-verbose-resolve: when processing dependencies, print detailed logs -filter="": filter packages in mirror - -filter-with-deps=false: when filtering, include dependencies of matching packages as well - -force-architectures=false: (only with architecture list) skip check that requested architectures are listed in Release file - -force-components=false: (only with component list) skip check that requested components are listed in Release file + -filter-with-deps: when filtering, include dependencies of matching packages as well + -force-architectures: (only with architecture list) skip check that requested architectures are listed in Release file + -force-components: (only with component list) skip check that requested components are listed in Release file -gpg-provider="": PGP implementation ("gpg" for external gpg or "internal" for Go internal implementation) - -ignore-signatures=false: disable verification of Release file signatures + -ignore-signatures: disable verification of Release file signatures -keyring=: gpg keyring to use when verifying Release file (could be specified multiple times) - -with-sources=false: download source packages in addition to binary packages - -with-udebs=false: download .udeb packages (Debian installer support) + -with-sources: download source packages in addition to binary packages + -with-udebs: download .udeb packages (Debian installer support) ERROR: unable to parse command diff --git a/system/t03_help/MirrorHelpTest_gold b/system/t03_help/MirrorHelpTest_gold index 59420201..4faee9a0 100644 --- a/system/t03_help/MirrorHelpTest_gold +++ b/system/t03_help/MirrorHelpTest_gold @@ -18,9 +18,9 @@ Options: -architectures="": list of architectures to consider during (comma-separated), default to all available -config="": location of configuration file (default locations are /etc/aptly.conf, ~/.aptly.conf) -db-open-attempts=10: number of attempts to open DB if it's locked by other instance - -dep-follow-all-variants=false: when processing dependencies, follow a & b if dependency is 'a|b' - -dep-follow-recommends=false: when processing dependencies, follow Recommends - -dep-follow-source=false: when processing dependencies, follow from binary to Source packages - -dep-follow-suggests=false: when processing dependencies, follow Suggests - -dep-verbose-resolve=false: when processing dependencies, print detailed logs + -dep-follow-all-variants: when processing dependencies, follow a & b if dependency is 'a|b' + -dep-follow-recommends: when processing dependencies, follow Recommends + -dep-follow-source: when processing dependencies, follow from binary to Source packages + -dep-follow-suggests: when processing dependencies, follow Suggests + -dep-verbose-resolve: when processing dependencies, print detailed logs -gpg-provider="": PGP implementation ("gpg" for external gpg or "internal" for Go internal implementation) diff --git a/system/t03_help/MirrorTest_gold b/system/t03_help/MirrorTest_gold index 6d505157..6be6e834 100644 --- a/system/t03_help/MirrorTest_gold +++ b/system/t03_help/MirrorTest_gold @@ -18,10 +18,10 @@ Options: -architectures="": list of architectures to consider during (comma-separated), default to all available -config="": location of configuration file (default locations are /etc/aptly.conf, ~/.aptly.conf) -db-open-attempts=10: number of attempts to open DB if it's locked by other instance - -dep-follow-all-variants=false: when processing dependencies, follow a & b if dependency is 'a|b' - -dep-follow-recommends=false: when processing dependencies, follow Recommends - -dep-follow-source=false: when processing dependencies, follow from binary to Source packages - -dep-follow-suggests=false: when processing dependencies, follow Suggests - -dep-verbose-resolve=false: when processing dependencies, print detailed logs + -dep-follow-all-variants: when processing dependencies, follow a & b if dependency is 'a|b' + -dep-follow-recommends: when processing dependencies, follow Recommends + -dep-follow-source: when processing dependencies, follow from binary to Source packages + -dep-follow-suggests: when processing dependencies, follow Suggests + -dep-verbose-resolve: when processing dependencies, print detailed logs -gpg-provider="": PGP implementation ("gpg" for external gpg or "internal" for Go internal implementation) ERROR: unable to parse command diff --git a/system/t03_help/WrongFlagTest_gold b/system/t03_help/WrongFlagTest_gold index 54c5af5f..8824d9ae 100644 --- a/system/t03_help/WrongFlagTest_gold +++ b/system/t03_help/WrongFlagTest_gold @@ -8,18 +8,18 @@ Options: -architectures="": list of architectures to consider during (comma-separated), default to all available -config="": location of configuration file (default locations are /etc/aptly.conf, ~/.aptly.conf) -db-open-attempts=10: number of attempts to open DB if it's locked by other instance - -dep-follow-all-variants=false: when processing dependencies, follow a & b if dependency is 'a|b' - -dep-follow-recommends=false: when processing dependencies, follow Recommends - -dep-follow-source=false: when processing dependencies, follow from binary to Source packages - -dep-follow-suggests=false: when processing dependencies, follow Suggests - -dep-verbose-resolve=false: when processing dependencies, print detailed logs + -dep-follow-all-variants: when processing dependencies, follow a & b if dependency is 'a|b' + -dep-follow-recommends: when processing dependencies, follow Recommends + -dep-follow-source: when processing dependencies, follow from binary to Source packages + -dep-follow-suggests: when processing dependencies, follow Suggests + -dep-verbose-resolve: when processing dependencies, print detailed logs -filter="": filter packages in mirror - -filter-with-deps=false: when filtering, include dependencies of matching packages as well - -force-architectures=false: (only with architecture list) skip check that requested architectures are listed in Release file - -force-components=false: (only with component list) skip check that requested components are listed in Release file + -filter-with-deps: when filtering, include dependencies of matching packages as well + -force-architectures: (only with architecture list) skip check that requested architectures are listed in Release file + -force-components: (only with component list) skip check that requested components are listed in Release file -gpg-provider="": PGP implementation ("gpg" for external gpg or "internal" for Go internal implementation) - -ignore-signatures=false: disable verification of Release file signatures + -ignore-signatures: disable verification of Release file signatures -keyring=: gpg keyring to use when verifying Release file (could be specified multiple times) - -with-sources=false: download source packages in addition to binary packages - -with-udebs=false: download .udeb packages (Debian installer support) + -with-sources: download source packages in addition to binary packages + -with-udebs: download .udeb packages (Debian installer support) ERROR: unable to parse flags diff --git a/vendor/github.com/smira/flag/flag.go b/vendor/github.com/smira/flag/flag.go index 04ec27e0..5c12da3e 100644 --- a/vendor/github.com/smira/flag/flag.go +++ b/vendor/github.com/smira/flag/flag.go @@ -366,12 +366,16 @@ func Set(name, value string) error { // otherwise, the default values of all defined flags in the set. func (f *FlagSet) PrintDefaults() { f.VisitAll(func(flag *Flag) { - format := " -%s=%s: %s\n" - if _, ok := flag.Value.(*stringValue); ok { - // put quotes on the value - format = " -%s=%q: %s\n" + if _, ok := flag.Value.(*boolValue); ok && flag.DefValue == "false" { + fmt.Fprintf(f.out(), " -%s: %s\n", flag.Name, flag.Usage) + } else { + format := " -%s=%s: %s\n" + if _, ok := flag.Value.(*stringValue); ok { + // put quotes on the value + format = " -%s=%q: %s\n" + } + fmt.Fprintf(f.out(), format, flag.Name, flag.DefValue, flag.Usage) } - fmt.Fprintf(f.out(), format, flag.Name, flag.DefValue, flag.Usage) }) }