From marcell at garage.maemo.org  Fri Dec  5 11:48:14 2008
From: marcell at garage.maemo.org (marcell at garage.maemo.org)
Date: Fri,  5 Dec 2008 11:48:14 +0200 (EET)
Subject: [Mintegration-commits] r46 - queue-manager/trunk
Message-ID: <20081205094814.C54FF3830B@garage.maemo.org>

Author: marcell
Date: 2008-12-05 11:48:14 +0200 (Fri, 05 Dec 2008)
New Revision: 46

Modified:
   queue-manager/trunk/queue-manager-lib
Log:
Check for capital letters in deb section. Reject changes file if any found.
NOTE: this patch is not very well tested, be careful when applying it to the live server!


Modified: queue-manager/trunk/queue-manager-lib
===================================================================
--- queue-manager/trunk/queue-manager-lib	2008-09-05 10:29:30 UTC (rev 45)
+++ queue-manager/trunk/queue-manager-lib	2008-12-05 09:48:14 UTC (rev 46)
@@ -172,6 +172,12 @@
 
         # marcell: if the section has a capital letter like "user/Applications" then 
         #          the second sed will erase everything from that line onwards!!!
+	sed '1,/Files:/d' "$CHANGES_FILE" | while read MD SIZE SECTION PRIORITY NAME; do
+		if  `echo $SECTION | sed -e 's/user\///' | grep -q [A-Z]` ; then
+			log "error" "Captital letter found in $SECTION"
+			return 1
+		fi
+	done
 	sed '1,/Files:/d' "$CHANGES_FILE" | sed '/[A-Z]/,$d' \
 		| while read MD SIZE SECTION PRIORITY NAME; do
 		if [ -z "$NAME" ]; then
@@ -944,7 +950,6 @@
 			echo "done"
 			if [ -f $_APT_DIR/$_APT_CONF ]; then
     		    ### FIXME ### we get a segmentation fault creating Contents for all
-echo "debug: $_APT_DIR/$_APT_CONF"
 #				if LD_ASSUME_KERNEL=2.4.5 apt-ftparchive generate $_APT_DIR/$_APT_CONF ; then
 				if apt-ftparchive generate $_APT_DIR/$_APT_CONF ; then
 					:


From marcell at garage.maemo.org  Fri Dec  5 13:29:31 2008
From: marcell at garage.maemo.org (marcell at garage.maemo.org)
Date: Fri,  5 Dec 2008 13:29:31 +0200 (EET)
Subject: [Mintegration-commits] r47 - queue-manager/trunk
Message-ID: <20081205112937.0C29038300@garage.maemo.org>

Author: marcell
Date: 2008-12-05 13:29:31 +0200 (Fri, 05 Dec 2008)
New Revision: 47

Modified:
   queue-manager/trunk/queue-manager-lib
Log:
Identify the repository in the ERROR mails.


Modified: queue-manager/trunk/queue-manager-lib
===================================================================
--- queue-manager/trunk/queue-manager-lib	2008-12-05 09:48:14 UTC (rev 46)
+++ queue-manager/trunk/queue-manager-lib	2008-12-05 11:29:31 UTC (rev 47)
@@ -1151,7 +1151,7 @@
 				done
 				;;
 			--error)
-				echo "An error occured while processing  $_changes" | mailx -s "[queue-manager-ERROR] $_changes" $NOTIFY_TO
+				echo "An error occured while processing  $_changes" | mailx -s "[queue-manager-ERROR] $REPONAME $_changes" $NOTIFY_TO
 				log "info" "[MAIL] ERROR message sent to $NOTIFY_TO"
 				;;
 		esac