[csw-devel] SF.net SVN: gar:[8112] csw/mgar/gar/v2/bin

wahwah at users.sourceforge.net wahwah at users.sourceforge.net
Thu Jan 21 15:15:25 CET 2010


Revision: 8112
          http://gar.svn.sourceforge.net/gar/?rev=8112&view=rev
Author:   wahwah
Date:     2010-01-21 14:15:25 +0000 (Thu, 21 Jan 2010)

Log Message:
-----------
mGAR v2: checkpkg, don't print long output by default, display a hint how to run in the debug mode

Modified Paths:
--------------
    csw/mgar/gar/v2/bin/checkpkg
    csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py

Modified: csw/mgar/gar/v2/bin/checkpkg
===================================================================
--- csw/mgar/gar/v2/bin/checkpkg	2010-01-21 14:06:24 UTC (rev 8111)
+++ csw/mgar/gar/v2/bin/checkpkg	2010-01-21 14:15:25 UTC (rev 8112)
@@ -42,6 +42,9 @@
 	COLOR_RESET=""
 fi
 
+readonly selfpath="$0"
+readonly selfargs="$*"
+
 # always print out a warning message. (to stderr)
 # exit script, if quit_on_warn set
 
@@ -79,6 +82,8 @@
 	print ERROR: $* >/dev/fd/2
 	cleanup
 	cleanupset
+	print "To run checkpkg in the debug mode, add the '-d' flag:"
+	print "${selfpath} -d ${selfargs}"
 	exit 1
 }
 
@@ -203,8 +208,7 @@
 
 case $software in
      *[A-Z]*)
-	echo ERROR: $software must be all lowercase
-	exit 1
+	errmsg "$software must be all lowercase"
 	;;
 esac
 
@@ -273,8 +277,7 @@
 
 case $version in
 	*-*)
-		print ERROR: VERSION field not allowed to have '"-"' in it
-		exit 1
+		errmsg "VERSION field not allowed to have \"-\" in it"
 	;;
 	*,REV=20[01][0-9].[0-9][0-9].[0-9][0-9]*)
 		:
@@ -494,8 +497,7 @@
 # sanity check against "depends on self"
 nawk '$2=="'$pkgname'" {exit 1}' $EXTRACTDIR/$pkgname/install/depend
 if [[ $? -ne 0 ]] ; then
-	print ERROR: $pkgname references self in depend file
-	exit 1
+	errmsg "$pkgname references self in depend file"
 fi
 
 # Verify that there are no multiple depends

Modified: csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py
===================================================================
--- csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py	2010-01-21 14:06:24 UTC (rev 8111)
+++ csw/mgar/gar/v2/bin/checkpkg.d/checkpkg-libs.py	2010-01-21 14:15:25 UTC (rev 8112)
@@ -121,7 +121,7 @@
   # same bit of code with do checking and reporting.
   #
   # TODO: Rewrite this using cheetah templates
-  if needed_sonames:
+  if options.debug and needed_sonames:
     print "Analysis of sonames needed by the package set:"
     binaries_with_missing_sonames = set([])
     for soname in needed_sonames:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



More information about the devel mailing list