update descriptions and comments

bin/myhsh

@@ -118,8 +118,9 @@ done
 
 echo
 if [ "$RESULT" = "1" ] ; then
+	echo
 	echog "!!!!!!! Hasher: FAILED FAILED FAILED !!!!!!!!!"
-	echog "Failed with $i, built only"
+	echog "Build failed with $i, built only"
 else
 	echog "Full list of the hashered packages:"
 fi

bin/rpmbb

@@ -123,9 +123,10 @@ do
 
 	if [ "$RET" != "0" ]
 	then
-		echo "!!!!!!!! ERROR !!!!!"
-		fatal "Failed with $i"
+		echo
+		echog "!!!!!!!! ERROR !!!!!!!"
+		fatal "Build failed with $i"
 	fi
 done
-echog "Built is done correctly"
+echog "Build is done correctly"
 date

bin/rpmbph

@@ -298,11 +298,11 @@ fi
 parse_cmd_pre_spec "$@"
 mygetopts $LISTARGS
 
-test -z "$LISTNAMES" && fatal "Error: no such file"
+test -z "$LISTNAMES" && fatal "file not found in '$@'"
 
 if [ "$VENDOR" = "alt" ] ; then
 	MDISTR=$MENV
-	test -z "$MDISTR" && fatal "missed backport version (f.i. run with -M24 param for Master 2.4)"
+	test -z "$MDISTR" && fatal "Missed backport version (f.i. run with -M24 param for Master 2.4)"
 	DISTRVERSION=$(get_altdistr_version $MDISTR)
 else
 	MDISTR=LOCAL

bin/rpmbs

@@ -42,7 +42,7 @@ phelp()
 	echog "$Usage"
 	echog "Options:"
 	echog " -u - sign and run gear build task after build"
-	echog " -a TASK - sign package(s), push/upload it and add to task TASK"
+	echog " -a TASK - sign package(s)/repo, push/upload it and add to (shared) task TASK"
 	echog " -l - lazy cleanup (clean before build, not after)"
 	echog "Ext. options:"
 	echog " -c - only sign package(s) with checking"
@@ -60,6 +60,7 @@ while getopts :hfscuUdnoa:z opt; do
     h) phelp; exit 0;;
     s) SIGN=1 ;;
     f) FORCE="--force" ;;
+# FIXME: handle SIGN separately
     c) CHECKONLY=1 ; SIGN=1 ;;
     u) UPLOADNOW=1 ; SIGN=1 ;;
 #    U) UPLOADNOW=1 ; SIGN=1 ; UPDATES=1 ;;
@@ -164,12 +165,6 @@ if [ -n "$NOSOURCE" ] ; then
 	exit $?
 fi
 
-# Упаковываем пакеты в src.rpm
-# FIXME: -s can be in name... (but not in option!)
-#LISTRPMARGS=
-#LISTRPMARGS=${LISTRPMARGS/-m/}
-#echo "@@ - $LISTRPMARGS - '$MENV'"
-
 # set SPECDIR from LISTNAMES if empty
 [ -n "$SPECDIR" ] || set_specdir $LISTNAMES
 
@@ -191,6 +186,7 @@ if [ -n "$UPLOADNOW" ] && is_gear $SPECDIR ; then
 	else
 		ssh $GIRARHOST build -b $BINARYREPO $BASENAME $TAG 2>&1 | tee $RPMDIR/uploaded.log.tmp
 	fi
+	# FIXME: incorporate
 	cat $RPMDIR/uploaded.log.tmp | head -n2 | tail -n1 >> $RPMDIR/uploaded.log
 	echo "run $TASKNUMBER task $BASENAME with tag $TAG at $GIRARHOST (in $BINARYREPO) at `date "+%c"`" >>$RPMDIR/uploaded.log
 	rm -f $RPMDIR/uploaded.log.tmp
@@ -294,8 +290,7 @@ fi
 
 echog "Uploading to $GIRARHOST"
 check_key
-# TODO:  rsync foo.src.rpm git.alt: && ssh git.alt build srpm foo.src.rpm
-# git.alt build -b 4.0 srpm foo.src.rpm
+
 rsync -vay --partial --progress $CHECKSUM \
  	-e ssh $LISTBUILT $GIRARHOST: && \
 echo "---------------------" && \
@@ -315,6 +310,7 @@ else
 	ssh $GIRARHOST build -b $BINARYREPO $TASKLIST 2>&1 | tee $RPMDIR/uploaded.log.tmp
 fi
 
+# FIXME: parse and incorporate
 cat $RPMDIR/uploaded.log.tmp | head -n2 | tail -n1 >> $RPMDIR/uploaded.log
 
 for i in $LISTBUILT ; do
@@ -336,7 +332,6 @@ for i in $LISTNAMES ; do
 		echo "  skipping for $i"
 		continue
 	fi
-	#DDIR=$BUILDROOT/${i/.spec/-buildroot}
 	# Hack about paths
 	test -f "$i" && NAME=$i || NAME=$CURDIR/$i
 	build_rpms_name $NAME

bin/rpmgp

 #!/bin/sh
-# 2004-2009 (c) Etersoft www.etersoft.ru
+# 2004-2010 (c) Etersoft www.etersoft.ru
 # Author: Vitaly Lipatov <lav@etersoft.ru>
 # Public domain
 #
@@ -151,17 +151,17 @@ phelp()
 	echog "$Descr"
 	echog "$Usage"
 	echog "Options:"
-	echog "rpmgp [options] [system] pkgname - download src.rpm from 'system' repository to RPM/SRPMS and install it"
+	echog "rpmgp [options] [system] pkgname - download src.rpm from 'system' repository"
 	echog " name - installed package name or src.rpm"
-	echog " system - name of system (ALT Linux by default if -a missed too)"
+	echog " system - name of system (ALT Linux by default if -a missed)"
 	echog " -a  search pkgname in all known repositories"
-	echog " -b  install packages needed for build (use sudo apt-get) (need spec not package name)"
 	echog " -c  check if this package exists in the ALT Linux repository"
 	echog " -d  download all matched packages"
 	echog " -g  remote clone repo to USER/packages and clone it locally"
-	echog " -m  migrate to gear from spec"
+	echog " -m  migrate to gear from spec/srpm"
+	echog "Ext. options:"
+	echog " -b  install packages needed for build (use sudo apt-get) (need spec not package name)"
 	echog " -l  list packages needed for build (in local pkg system notation) (experimental)"
-	echog " -n  do not install after download, just download in current dir"
 	echog " -r  refresh package list (download it again)"
 	echog " -s  list all known remote repositories"
 	exit 0

share/eterbuild/functions/hasher

@@ -59,7 +59,7 @@ prepare_aptconfig()
 	if [ -n "$ETERBUILD_APTREPO" ] ; then
 		cat <<EOF >>$OURSOURCES
 
-# Apply repo(s) from ETERBUILD_APTREPO variable
+# Apply repo(s) from external ETERBUILD_APTREPO variable
 $ETERBUILD_APTREPO
 EOF
 	fi