From fda384a7a78dde734cd436626dfdc4b8d5066a0e Mon Sep 17 00:00:00 2001 From: Alejandro Mery Date: Thu, 12 Jul 2007 16:27:43 +0000 Subject: [PATCH] * improved bin/sde-list-package usage to be more helpful for bin/sde-list-download - man pages updated too. git-svn-id: svn://svn.opensde.net/opensde/opensde/trunk@21685 10447126-35f2-4685-b0cf-6dd780d3921f --- bin/sde-list-pkg | 21 ++++++++++++++------- doc/man/sde-list.1 | 24 +++++++++++++++++------- src/doc/man/sde-list.txt | 17 ++++++++++++----- 3 files changed, 43 insertions(+), 19 deletions(-) diff --git a/bin/sde-list-pkg b/bin/sde-list-pkg index 81a0dff..63b7b40 100755 --- a/bin/sde-list-pkg +++ b/bin/sde-list-pkg @@ -22,18 +22,18 @@ set -e . $SDEROOT/lib/libsde.in - list_usage() { local progname=${0##*/} cat <] - $progname [--cfg ] + $progname [--cfg ] [--extenders] [--repositories] [ITEMS...] EOT } list_arch() { local repo= arch="$1" local files= + if [ ! -s $SDEROOT/architecture/$arch/archtest.out ]; then echo_error "wrong architecture ($arch) specified, aborting." list_usage @@ -57,10 +57,12 @@ list_desc() { arch= config= -mode= +mode=desc +extenders= +repositories= -shortopts=a:c: -longopts=arch:,cfg: +shortopts='a:c:r' +longopts='arch:,cfg:,extenders,repositories' options=$( getopt -o "$shortopts" -l "$longopts" -- "$@" ) if [ $? -ne 0 ]; then list_usage @@ -75,8 +77,13 @@ while [ $# -gt 0 ]; do case "$1" in -a|--arch) mode=arch arch="$2"; shift ;; - -c|--cfg) mode=desc - config="$2"; shift ;; + -c|--cfg) config="$2"; shift ;; + + -r|--repositories) + repositories=yes ;; + --extenders) + extenders=yes ;; + --) shift; break ;; *) echo_abort 1 "Unknown argument '$1', aborting." esac diff --git a/doc/man/sde-list.1 b/doc/man/sde-list.1 index c3bd291..3f07390 100644 --- a/doc/man/sde-list.1 +++ b/doc/man/sde-list.1 @@ -1,11 +1,11 @@ .\" Title: sde-list .\" Author: .\" Generator: DocBook XSL Stylesheets v1.72.0 -.\" Date: 07/11/2007 +.\" Date: 07/12/2007 .\" Manual: .\" Source: .\" -.TH "SDE\-LIST" "1" "07/11/2007" "" "" +.TH "SDE\-LIST" "1" "07/12/2007" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -13,7 +13,7 @@ .SH "NAME" sde\-list \- produce lists needed by other commands .SH "SYNOPSIS" -\fIsde list\fR [DISCRIMINATOR] [OPTIONS] +\fIsde list\fR [DISCRIMINATOR] [OPTIONS] [ITEMS\] .sp .SH "DISCRIMINATORS" .PP @@ -30,12 +30,22 @@ downloadable files of a list of packages, or all if no package is given .PP \-a, \-\-arch .RS 4 -list the packages available for the specified architecture +list the packages available for the specified architecture, ignoring the given items and other options. .RE .PP \-c, \-\-cfg .RS 4 -list the packages active for the specified config +use an specified config to see the active packages, instead of all of them. +.RE +.PP +\-r, \-\-repositories +.RS 4 +the given list is a list of repositories, not packages. +.RE +.PP +\-\-extenders +.RS 4 +include the packages which extend the given items. .RE .SH "OPTIONS FOR DOWNLOAD" .PP @@ -49,9 +59,9 @@ list the download files needed for a given config. the given list is a list of repositories, not packages. .RE .PP -\-\-dependencies +\-\-extenders .RS 4 -include the download files of the active dependencies on the specified config. +include the download files of the active extenders on the specified config. .RE .PP \-\-checksum diff --git a/src/doc/man/sde-list.txt b/src/doc/man/sde-list.txt index cd77559..07d592e 100644 --- a/src/doc/man/sde-list.txt +++ b/src/doc/man/sde-list.txt @@ -8,7 +8,7 @@ sde-list - produce lists needed by other commands SYNOPSIS -------- -'sde list' [DISCRIMINATOR] [OPTIONS] +'sde list' [DISCRIMINATOR] [OPTIONS] [ITEMS...] DISCRIMINATORS -------------- @@ -24,10 +24,17 @@ OPTIONS FOR PACKAGES -------------------- -a, --arch:: - list the packages available for the specified architecture + list the packages available for the specified architecture, ignoring + the given items and other options. -c, --cfg:: - list the packages active for the specified config + use an specified config to see the active packages, instead of all of them. + +-r, --repositories:: + the given list is a list of repositories, not packages. + +--extenders:: + include the packages which extend the given items. OPTIONS FOR DOWNLOAD -------------------- @@ -38,8 +45,8 @@ OPTIONS FOR DOWNLOAD -r, --repositories:: the given list is a list of repositories, not packages. ---dependencies:: - include the download files of the active dependencies on the +--extenders:: + include the download files of the active extenders on the specified config. --checksum::