permit --{buildroot,timecheck,test,sign} with -tX (Toshio Kuratomi).

CVS patchset: 2292
CVS date: 1998/09/11 08:11:06

1 files changed, 6 insertions, 5 deletions

diff --git a/rpm.c b/rpm.c
index 79f18dfc9..16f52219e 100755
--- a/rpm.c
+++ b/rpm.c
@@ -821,7 +821,8 @@ int main(int argc, char ** argv) {
 
 	  case GETOPT_BUILDROOT:
 	    if (bigMode != MODE_UNKNOWN &&
-		bigMode != MODE_BUILD && bigMode != MODE_REBUILD)
+		bigMode != MODE_BUILD && bigMode != MODE_REBUILD &&
+		bigMode != MODE_TARBUILD)
 		argerror(_("only one major mode may be specified"));
 	    buildRootOverride = optArg;
 	    break;
@@ -926,7 +927,7 @@ int main(int argc, char ** argv) {
 	    bigMode = MODE_QUERYTAGS;
 
     if (buildRootOverride && bigMode != MODE_BUILD &&
-	bigMode != MODE_REBUILD) {
+	bigMode != MODE_REBUILD && bigMode != MODE_TARBUILD) {
 	argerror("--buildroot may only be used during package builds");
     }
 
@@ -937,7 +938,7 @@ int main(int argc, char ** argv) {
 			"database"));
 
     if (timeCheck && bigMode != MODE_BUILD && bigMode != MODE_REBUILD &&
-	bigMode != MODE_RECOMPILE) 
+	bigMode != MODE_RECOMPILE && bigMode != MODE_TARBUILD) 
 	argerror(_("--timecheck may only be used during package builds"));
     
     if (bigMode != MODE_QUERY && queryFor) 
@@ -1035,7 +1036,7 @@ int main(int argc, char ** argv) {
 		   "verification"));
 
     if (bigMode != MODE_INSTALL && bigMode != MODE_UNINSTALL &&
-	bigMode != MODE_BUILD && test)
+	bigMode != MODE_BUILD && bigMode != MODE_TARBUILD && test )
 	argerror(_("--test may only be specified during package installation, "
 		 "erasure, and building"));
 
@@ -1093,7 +1094,7 @@ int main(int argc, char ** argv) {
 
     if (signIt) {
         if (bigMode == MODE_REBUILD || bigMode == MODE_BUILD ||
-	    bigMode == MODE_RESIGN) {
+	    bigMode == MODE_RESIGN || bigMode == MODE_TARBUILD) {
             if (poptPeekArg(optCon)) {
 		switch (rpmLookupSignatureType()) {
 		  case RPMSIGTAG_PGP: