[Mintegration-commits] r24 - queue-manager/trunk

[feri at garage.maemo.org]

Author: feri
Date: 2007-02-05 20:28:56 +0200 (Mon, 05 Feb 2007)
New Revision: 24

Modified:
   queue-manager/trunk/queue-manager
   queue-manager/trunk/queue-manager-lib
   queue-manager/trunk/test-queue-manager.conf
Log:
do not allow upload if a package has the same version or newer in the database already; fixing the maintainer info fetching bug (the info was not fetched from signed changes files, because grep-dctrl failed)

Modified: queue-manager/trunk/queue-manager
===================================================================
--- queue-manager/trunk/queue-manager	2007-01-29 22:46:55 UTC (rev 23)
+++ queue-manager/trunk/queue-manager	2007-02-05 18:28:56 UTC (rev 24)
@@ -26,7 +26,7 @@
 
 ME=`basename $0`
 my_dir=`dirname $0`
-check_version=n
+check_version=y
 if echo "$my_dir" | grep -q "^\." ;then
   my_dir=$PWD/${my_dir//\/\.\//\/}
 fi
@@ -44,7 +44,7 @@
 ###############################################################################
 
 print_help () {
-  echo "$ME v2.1"
+  echo "$ME v2.2"
   echo ""
   echo "Use $ME with the following flags:"
   echo ""
@@ -62,7 +62,7 @@
   echo "-s           rebuild an specific SUITE. needs an apt.\$SUITE.conf file to exist"
   echo "-S           rebuild an specific SUITE, creating the needed apt.\$SUITE.conf"
   echo "             the entry for the needed \$SUITE must exist under apt.conf"
-  echo "-u           NOT use uniq versions for the repository"
+  echo "-u           NOT use unique versions for the repository"
   echo "-U           put Unknown packages under unknown directory"
   echo "-w           execute do-wanna-build.sh"
   echo "-x <key_id>  sign the built repository with the specifief GPG/PGP key"
@@ -89,7 +89,7 @@
 		s) REBUILD_SUITE="$OPTARG";;
 		S) REBUILD_SUITE="$OPTARG"; CREATE_APT_FILE=y;;
 		T) SUITE="$OPTARG";;
-		u) uniq=n;;
+		u) uniq=n; check_version=n;;
 		U) USEDELAY=n;;
 		w) EXECWANNABUILD=y;;
 		x) SIGNREPO=y; SIGNINGKEY="$OPTARG";;

Modified: queue-manager/trunk/queue-manager-lib
===================================================================
--- queue-manager/trunk/queue-manager-lib	2007-01-29 22:46:55 UTC (rev 23)
+++ queue-manager/trunk/queue-manager-lib	2007-02-05 18:28:56 UTC (rev 24)
@@ -969,7 +969,7 @@
 
 	local _package=`fetch_field package $_changes`
 
-	_recipients="$( grep-dctrl "" -n -s Changed-By,Maintainer "$_changes" | sort | uniq  | sed 's/.*<\(.*@.*\..*\)>/\1/' )"
+	_recipients="$( grep-dctrl "" --ignore-parse-errors -n -s Changed-By,Maintainer "$_changes" | sort | uniq  | sed 's/.*<\(.*@.*\..*\)>/\1/' )"
 #	_recipients="$( src-sub $_package )
 
 	for ALLOWED_DOMAIN in $( echo $ALLOWED_DOMAINS | tr , \ ); do

Modified: queue-manager/trunk/test-queue-manager.conf
===================================================================
--- queue-manager/trunk/test-queue-manager.conf	2007-01-29 22:46:55 UTC (rev 23)
+++ queue-manager/trunk/test-queue-manager.conf	2007-02-05 18:28:56 UTC (rev 24)
@@ -51,7 +51,7 @@
 # The default suite we install the packages under.
 # Renaming the script and sourcing a file with a different DEFAULT_SUITE
 # creates a new queue manager. Change also the incoming directory!
-DISTS="main non-free contrib"
+DISTS="main non-free"
 ARCHS="armel i386 all"
 ORIGIN="Nokia"