- update trpm.

- factor all mode-specific options into mode-specific tables.
- treat an unspecified epoch as Epoch: 0 everywhere.

CVS patchset: 5578
CVS date: 2002/07/29 23:06:06

1 files changed, 26 insertions, 25 deletions

diff --git a/rpmpopt.in b/rpmpopt.in
index 9c669d6db..a65642c35 100644
--- a/rpmpopt.in
+++ b/rpmpopt.in
@@ -117,7 +117,7 @@ rpm alias --rebuilddbapi	 --define '_dbapi_rebuild !#:+'
 rpm alias --rebuilddbpath	 --define '_dbapath_rebuild !#:+'
 
 #==============================================================================
-#	[--dbpath <dir>]	"use <dir> as the directory for the database"
+#	[--dbpath DIRECTORY"	"use database in DIRECTORY"
 rpm	alias --dbpath		--define '_dbpath !#:+'
 #	[--ftpport <port>]	"port number of ftp server (or proxy)"
 rpm	alias --ftpport		--define '_ftpport !#:+'
@@ -165,6 +165,7 @@ rpm	exec --verifydb		rpmd --verifydb
 rpm	exec --addsign		rpmk --addsign
 rpm	exec -K			rpmk -K
 rpm	exec --checksig		rpmk --checksig
+rpm	exec --import		rpmk --import
 rpm	exec --resign		rpmk --resign
 
 rpm	exec -q			rpmq -q
@@ -182,8 +183,8 @@ rpm	alias --without		--define "_without_!#:+    --without-!#:+" \
 	--POPTargs=$"<option>"
 #==============================================================================
 rpmb	alias --dbpath		--define '_dbpath !#:+' \
-	--POPTdesc=$"use <dir> as the directory for the database" \
-	--POPTargs=$"<dir>"
+	--POPTdesc=$"use database in DIRECTORY" \
+	--POPTargs=$"DIRECTORY"
 rpmb	alias --ftpport		--define '_ftpport !#:+'
 rpmb	alias --ftpproxy	--define '_ftpproxy !#:+'
 rpmb	alias --httpport	--define '_httpport !#:+'
@@ -197,8 +198,8 @@ rpmb	alias --without		--define "_without_!#:+    --without-!#:+" \
 	--POPTargs=$"<option>"
 #==============================================================================
 rpmbuild	alias --dbpath		--define '_dbpath !#:+' \
-	--POPTdesc=$"use <dir> as the directory for the database" \
-	--POPTargs=$"<dir>"
+	--POPTdesc=$"use database in DIRECTORY" \
+	--POPTargs=$"DIRECTORY"
 rpmbuild alias --ftpport		--define '_ftpport !#:+'
 rpmbuild alias --ftpproxy	--define '_ftpproxy !#:+'
 rpmbuild alias --httpport	--define '_httpport !#:+'
@@ -212,56 +213,56 @@ rpmbuild alias --without	--define "_without_!#:+  --without-!#:+" \
 	--POPTargs=$"<option>"
 #==============================================================================
 rpmd	alias --dbpath		--define '_dbpath !#:+' \
-	--POPTdesc=$"use <dir> as the directory for the database" \
-	--POPTargs=$"<dir>"
+	--POPTdesc=$"use database in DIRECTORY" \
+	--POPTargs=$"DIRECTORY"
 rpmd	alias --ftpport		--define '_ftpport !#:+'
 rpmd	alias --ftpproxy	--define '_ftpproxy !#:+'
 rpmd	alias --httpport	--define '_httpport !#:+'
 rpmd	alias --httpproxy	--define '_httpproxy !#:+'
 #==============================================================================
 rpmdb	alias --dbpath		--define '_dbpath !#:+' \
-	--POPTdesc=$"use <dir> as the directory for the database" \
-	--POPTargs=$"<dir>"
+	--POPTdesc=$"use database in DIRECTORY" \
+	--POPTargs=$"DIRECTORY"
 rpmdb	alias --ftpport		--define '_ftpport !#:+'
 rpmdb	alias --ftpproxy	--define '_ftpproxy !#:+'
 rpmdb	alias --httpport	--define '_httpport !#:+'
 rpmdb	alias --httpproxy	--define '_httpproxy !#:+'
 #==============================================================================
 rpme	alias --dbpath		--define '_dbpath !#:+' \
-	--POPTdesc=$"use <dir> as the directory for the database" \
-	--POPTargs=$"<dir>"
+	--POPTdesc=$"use database in DIRECTORY" \
+	--POPTargs=$"DIRECTORY"
 rpme	alias --ftpport		--define '_ftpport !#:+'
 rpme	alias --ftpproxy	--define '_ftpproxy !#:+'
 rpme	alias --httpport	--define '_httpport !#:+'
 rpme	alias --httpproxy	--define '_httpproxy !#:+'
 #==============================================================================
 rpmi	alias --dbpath		--define '_dbpath !#:+' \
-	--POPTdesc=$"use <dir> as the directory for the database" \
-	--POPTargs=$"<dir>"
+	--POPTdesc=$"use database in DIRECTORY" \
+	--POPTargs=$"DIRECTORY"
 rpmi	alias --ftpport		--define '_ftpport !#:+'
 rpmi	alias --ftpproxy	--define '_ftpproxy !#:+'
 rpmi	alias --httpport	--define '_httpport !#:+'
 rpmi	alias --httpproxy	--define '_httpproxy !#:+'
 #==============================================================================
 rpmk	alias --dbpath		--define '_dbpath !#:+' \
-	--POPTdesc=$"use <dir> as the directory for the database" \
-	--POPTargs=$"<dir>"
+	--POPTdesc=$"use database in DIRECTORY" \
+	--POPTargs=$"DIRECTORY"
 rpmk	alias --ftpport		--define '_ftpport !#:+'
 rpmk	alias --ftpproxy	--define '_ftpproxy !#:+'
 rpmk	alias --httpport	--define '_httpport !#:+'
 rpmk	alias --httpproxy	--define '_httpproxy !#:+'
 #==============================================================================
 rpmsign	alias --dbpath		--define '_dbpath !#:+' \
-	--POPTdesc=$"use <dir> as the directory for the database" \
-	--POPTargs=$"<dir>"
+	--POPTdesc=$"use database in DIRECTORY" \
+	--POPTargs=$"DIRECTORY"
 rpmsign	alias --ftpport		--define '_ftpport !#:+'
 rpmsign	alias --ftpproxy	--define '_ftpproxy !#:+'
 rpmsign	alias --httpport	--define '_httpport !#:+'
 rpmsign	alias --httpproxy	--define '_httpproxy !#:+'
 #==============================================================================
 rpmq	alias --dbpath		--define '_dbpath !#:+' \
-	--POPTdesc=$"use <dir> as the directory for the database" \
-	--POPTargs=$"<dir>"
+	--POPTdesc=$"use database in DIRECTORY" \
+	--POPTargs=$"DIRECTORY"
 rpmq	alias --ftpport		--define '_ftpport !#:+'
 rpmq	alias --ftpproxy	--define '_ftpproxy !#:+'
 rpmq	alias --httpport	--define '_httpport !#:+'
@@ -333,8 +334,8 @@ rpmq	alias --filesbypkg --qf '[%-25{=NAME} %{FILENAMES}\n]' \
 	--POPTdesc=$"list all files from each package"
 #==============================================================================
 rpmquery	alias --dbpath		--define '_dbpath !#:+' \
-	--POPTdesc=$"use <dir> as the directory for the database" \
-	--POPTargs=$"<dir>"
+	--POPTdesc=$"use database in DIRECTORY" \
+	--POPTargs=$"DIRECTORY"
 rpmquery	alias --ftpport		--define '_ftpport !#:+'
 rpmquery	alias --ftpproxy	--define '_ftpproxy !#:+'
 rpmquery	alias --httpport	--define '_httpport !#:+'
@@ -405,16 +406,16 @@ rpmquery	alias --filesbypkg --qf '[%-25{=NAME} %{FILENAMES}\n]' \
 	--POPTdesc=$"list all files from each package"
 #==============================================================================
 rpmu	alias --dbpath		--define '_dbpath !#:+' \
-	--POPTdesc=$"use <dir> as the directory for the database" \
-	--POPTargs=$"<dir>"
+	--POPTdesc=$"use database in DIRECTORY" \
+	--POPTargs=$"DIRECTORY"
 rpmu	alias --ftpport		--define '_ftpport !#:+'
 rpmu	alias --ftpproxy	--define '_ftpproxy !#:+'
 rpmu	alias --httpport	--define '_httpport !#:+'
 rpmu	alias --httpproxy	--define '_httpproxy !#:+'
 #==============================================================================
 rpmv	alias --dbpath		--define '_dbpath !#:+' \
-	--POPTdesc=$"use <dir> as the directory for the database" \
-	--POPTargs=$"<dir>"
+	--POPTdesc=$"use database in DIRECTORY" \
+	--POPTargs=$"DIRECTORY"
 rpmv	alias --ftpport		--define '_ftpport !#:+'
 rpmv	alias --ftpproxy	--define '_ftpproxy !#:+'
 rpmv	alias --httpport	--define '_httpport !#:+'