Merge branch 'master' of git.alt:packages/etersoft-build-utils

bin/rpmbs

@@ -249,6 +249,7 @@ if [ -r "$LISTBUILT" ] ; then
 	check_gear_and_tag
 fi
 
+
 echog "Will try to sign follow packages with GPG: \$LISTBUILT"
 # 1. only rpm command has --addsign 2. do 3 retries
 rpm --addsign $LISTBUILT || rpm --addsign $LISTBUILT || rpm --addsign $LISTBUILT
@@ -260,6 +261,7 @@ if [ ! "$RET" = "0" ] ; then
 	exit 1
 fi
 
+
 ############################################
 echog "Changing permissions..."
 chmod 644 -- $LISTBUILT || fatal "can't chmod"
@@ -315,11 +317,14 @@ else
 fi
 
 for i in $LISTBUILT ; do
+	# FIXME: more general way
 	LOGFILE="$LOGDIR/`basename $i .src.rpm`$MENVARG.log"
 	echo >>$LOGFILE
 	date >>$LOGFILE
 	echo "uploaded">>$LOGFILE
-	echo "$(basename $i) run build src.rpm at $GIRARHOST ($MENV) at `date "+%c"`" >>$RPMDIR/uploaded.log
+	TEXTADD="run build src.rpm"
+	[ -z "$TASKNUMBER" ] || TEXTADD="add src.rpm to task $TASKNUMBER"
+	echo "$(basename $i) $TEXTADD at $GIRARHOST ($MENV) at `date "+%c"`" >>$RPMDIR/uploaded.log
 done
 
 echog "Removing buildroot after upload..."

bin/rpmgp

@@ -251,6 +251,9 @@ if [ -n "$CHECKONLINE" ] ; then
 	done
 	echog "Repository     Filename"
 	printf "%-12s %30s\n" $RET $SRCRPM
+	if [ "$RET" = "MISSED" ] ; then
+		exit 1
+	fi
 	exit 0
 fi
 

etc/apt/apt.conf.M51

+/*
+ * This is the main configuration file for the APT suite of tools,
+ * see apt.conf(5) for details.
+ */
+
+Dir::Etc::main "/dev/null";
+Dir::Etc::parts "/var/empty";
+Dir::Etc::SourceParts "/var/empty";
+
+Dir::Etc::sourcelist "/etc/eterbuild/apt/sources.list.M51";

etc/apt/sources.list.M51

+# Package repository URLs
+#
+# You can add [alt] after rpm for digital signature check
+
+rpm file:/var/ftp/ pub/ALTLinux/5.1/i586 classic
+rpm file:/var/ftp/ pub/ALTLinux/5.1/noarch classic
+rpm file:/var/ftp/ pub/ALTLinux/5.1/x86_32 classic
+
+#rpm file:/var/ftp/ pub/ALTLinux/updates/5.1/i586 updates
+#rpm file:/var/ftp/ pub/ALTLinux/backports/5.1/i586 backports

etc/repos

+# see whohas package too
 # all known src.rpm repositories (for rpmgp command)
 alt          ftp://ftp.altlinux.ru/pub/distributions/ALTLinux/Sisyphus/files/SRPMS
 fedora       ftp://mirror.yandex.ru/fedora/linux/releases/11/Fedora/source/SRPMS/
 fedora-devel ftp://mirror.yandex.ru/fedora/linux/development/source/SRPMS
 fedora-updates ftp://mirror.yandex.ru/fedora/linux/updates/11/SRPMS/
 fedora-ccrma http://ccrma.stanford.edu/planetccrma/mirror/fedora/linux/planetccrma/9/SRPMS
+fedora-epel http://download.fedora.redhat.com/pub/epel/5/SRPMS
 mandriva     ftp://mirror.yandex.ru/mandriva/official/2009.0/SRPMS/main/release
 mandriva-contrib ftp://mirror.yandex.ru/mandriva/official/2009.0/SRPMS/contrib/release
 mandriva-cooker-contrib ftp://mirror.yandex.ru/mandriva/devel/cooker/SRPMS/contrib/release

tools/check_publish.sh

@@ -30,21 +30,32 @@ print_usedby()
 
 
 [ -n "$SPECLIST" ] || SPECLIST=`find $RPMDIR/SPECS -type f -name "*.spec"`
+
 for i in $SPECLIST ; do
 	if echo $i | grep -q HELP ; then
 		continue
 	fi
-	LANG=C rpmgp -c $i 2>&1 | grep -v "^Note" | grep -v "^Checking" | grep -v "^Repository"
+	echo $i
+	#LANG=C rpmgp -c $i 2>&1 | grep -v "^Note" | grep -v "^Checking" | grep -v "^Repository"
+
 	USEDBY=$(get_wd `basename $i .spec`)
 	if [ -n "$USEDBY" ] ; then 
 		print_usedby $i $USEDBY >$i.usedby
 		#[ -n "`cat $i.usedby`" ] || 
 	else
-		if [ -r $i.usedby ] ; then
-			echo "$i do not required anymore"
-		else
+#		if [ -r $i.usedby ] ; then
+#			echo "$i do not required anymore"
+#		else
 			rm -f $i.usedby
+#		fi
 	fi
+	rpmbugs -t $i | grep -v "CLO.*FIX" | grep "@altlinux" >$i.bugs
+	test -s $i.bugs || rm -f $i.bugs
+
+	if rpmgp -c $i | grep -q MISSED ; then
+		rpmgp -c $i >$i.missed
+	else
+		rm -f $i.$missed
 	fi
 done