From 90fff5f1bd9e20d86f5945c353e4662de5694344 Mon Sep 17 00:00:00 2001
From: Steven Chamberlain <steven@pyro.eu.org>
Date: Thu, 13 Nov 2014 13:41:27 +0000
Subject: g-i: try to stop qemu with SIGINT before SIGKILL

---
 bin/g-i-installation.sh | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh
index 60223bdf..45bc0a87 100644
--- a/bin/g-i-installation.sh
+++ b/bin/g-i-installation.sh
@@ -109,7 +109,16 @@ cleanup_all() {
 	#
 	# kill qemu
 	#
-	sudo kill -9 $(ps fax | grep [q]emu-system | grep "vnc=$DISPLAY " 2>/dev/null | awk '{print $1}') || true
+	# use SIGINT for 10 seconds to encourage graceful shutdown
+	for i in $(seq 1 10); do
+		QEMU_PID=$(ps fax | grep [q]emu-system | grep "vnc=$DISPLAY " 2>/dev/null | awk '{print $1}')
+		[ -z "$QEMU_PID" ] && break
+		sudo kill -INT $QEMU_PID
+		sleep 1
+	done
+	# force exit with SIGKILL if still running now
+	QEMU_PID=$(ps fax | grep [q]emu-system | grep "vnc=$DISPLAY " 2>/dev/null | awk '{print $1}')
+	[ -z "$QEMU_PID" ] || sudo kill -KILL $QEMU_PID
 	sleep 0.3s
 	#
 	# save logs if there are any
-- 
cgit v1.2.3-70-g09d2


From f379e3c01c7f351985778d4b2d9ba57fd13e6c71 Mon Sep 17 00:00:00 2001
From: Holger Levsen <holger@layer-acht.org>
Date: Fri, 14 Nov 2014 14:07:33 +0100
Subject: g-i-i: remove workaround for hurd as it's not that slow anymore

---
 bin/g-i-installation.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh
index 45bc0a87..a3e940f0 100644
--- a/bin/g-i-installation.sh
+++ b/bin/g-i-installation.sh
@@ -1257,7 +1257,7 @@ case $NAME in
 			;;
 	debian-edu_*combi-server)		monitor_system install wait4match 3000
 			;;
-	*_hurd*|debian-edu_*wheezy*standalone*)		monitor_system install wait4match 1200
+	debian-edu_*wheezy*standalone*)		monitor_system install wait4match 1200
 			;;
 	*)		monitor_system install wait4match
 			;;
-- 
cgit v1.2.3-70-g09d2


From dbe8da10bdd06b71a339853ce3b77acc64a44deb Mon Sep 17 00:00:00 2001
From: Holger Levsen <holger@layer-acht.org>
Date: Fri, 14 Nov 2014 14:16:33 +0100
Subject: g-i-i: edu main server: log in sooner

---
 bin/g-i-installation.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh
index a3e940f0..ebb1d1a5 100644
--- a/bin/g-i-installation.sh
+++ b/bin/g-i-installation.sh
@@ -720,11 +720,11 @@ post_install_boot() {
 							;;
 						0350)	do_and_report type root
 							;;
-						0480)	do_and_report key enter
+						0400)	do_and_report key enter
 							;;
-						0490)	do_and_report type r00tme
+						0410)	do_and_report type r00tme
 							;;
-						0500)	do_and_report key enter
+						0420)	do_and_report key enter
 							;;
 						0550)	do_and_report type ps
 							;;
-- 
cgit v1.2.3-70-g09d2


From 17e80931ca4088a71ead9abd63c6ba07da269629 Mon Sep 17 00:00:00 2001
From: Steven Chamberlain <steven@pyro.eu.org>
Date: Fri, 14 Nov 2014 13:14:39 +0000
Subject: g-i: make PRESEED_URL contain just the URL itself!

---
 bin/g-i-installation.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh
index ebb1d1a5..356abed6 100644
--- a/bin/g-i-installation.sh
+++ b/bin/g-i-installation.sh
@@ -206,7 +206,7 @@ bootstrap_system() {
 	# preseeding related variables
 	PRESEEDCFG="preseed.cfg"
 	PRESEED_PATH=d-i-preseed-cfgs
-	PRESEED_URL="url=$QEMU_WEBSERVER/$PRESEED_PATH/${NAME}_$PRESEEDCFG"
+	PRESEED_URL="$QEMU_WEBSERVER/$PRESEED_PATH/${NAME}_$PRESEEDCFG"
 	#
 	# boot configuration
 	#
@@ -309,7 +309,7 @@ bootstrap_system() {
 		EXTRA_APPEND="$EXTRA_APPEND priority=critical"
 		;;
 	esac
-	APPEND="auto=true $EXTRA_APPEND $INST_LOCALE $INST_KEYMAP $PRESEED_URL $INST_VIDEO -- quiet"
+	APPEND="auto=true $EXTRA_APPEND $INST_LOCALE $INST_KEYMAP url=$PRESEED_URL $INST_VIDEO -- quiet"
 	show_preseed $(hostname -f)/$PRESEED_PATH/${NAME}_$PRESEEDCFG
 	echo
 	echo "Starting QEMU now:"
-- 
cgit v1.2.3-70-g09d2


From e98eb468eaae3950be0ec37c50e287a9ca176c24 Mon Sep 17 00:00:00 2001
From: Holger Levsen <holger@layer-acht.org>
Date: Fri, 14 Nov 2014 14:34:17 +0100
Subject: d-edu ltspserver: choose eth0

---
 d-i-preseed-cfgs/debian-edu_jessie_main-ltsp-server_preseed.cfg | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/d-i-preseed-cfgs/debian-edu_jessie_main-ltsp-server_preseed.cfg b/d-i-preseed-cfgs/debian-edu_jessie_main-ltsp-server_preseed.cfg
index d70b5140..98d853a8 100644
--- a/d-i-preseed-cfgs/debian-edu_jessie_main-ltsp-server_preseed.cfg
+++ b/d-i-preseed-cfgs/debian-edu_jessie_main-ltsp-server_preseed.cfg
@@ -23,10 +23,10 @@ d-i keymap select us
 
 # netcfg will choose an interface that has link if possible. This makes it
 # skip displaying a list if there is more than one interface.
-d-i netcfg/choose_interface select auto
+#d-i netcfg/choose_interface select auto
 
 # To pick a particular interface instead:
-#d-i netcfg/choose_interface select eth0
+d-i netcfg/choose_interface select eth0
 
 # To set a different link detection timeout (default is 3 seconds).
 # Values are interpreted as seconds.
-- 
cgit v1.2.3-70-g09d2


From 3ccbc06b192e7e9bc51f861c611c637d61068fb8 Mon Sep 17 00:00:00 2001
From: Holger Levsen <holger@layer-acht.org>
Date: Fri, 14 Nov 2014 14:59:58 +0100
Subject: suoders: also allow less bloddy kills. (needed due to 90fff5f1 by
 Steven)

---
 etc/sudoers.d/jenkins | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/sudoers.d/jenkins b/etc/sudoers.d/jenkins
index 53095f2d..d3356045 100644
--- a/etc/sudoers.d/jenkins
+++ b/etc/sudoers.d/jenkins
@@ -17,7 +17,7 @@ jenkins ALL=  \
 	/bin/mount -o loop*, \
 	/bin/mount --bind *, \
 	/usr/bin/du *, \
-	/bin/kill -9 *, \
+	/bin/kill *, \
 	/usr/bin/file *, \
 	/bin/dd if=/dev/zero of=/dev/jenkins*, \
 	/usr/bin/qemu-system-x86_64 *, \
-- 
cgit v1.2.3-70-g09d2


From 28d563df14839706b2e471eb511fb86184904e17 Mon Sep 17 00:00:00 2001
From: Holger Levsen <holger@layer-acht.org>
Date: Fri, 14 Nov 2014 15:41:21 +0100
Subject: get rid off harmless but confusing error message

---
 bin/g-i-installation.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh
index 356abed6..660198be 100644
--- a/bin/g-i-installation.sh
+++ b/bin/g-i-installation.sh
@@ -187,7 +187,9 @@ bootstrap_system() {
 	RELEASE="$(echo $NAME | cut -d "_" -f2)"
 	if [ "$RELEASE" != "jessie" ] ; then
 		echo "Workaround to remove swap signature from previous installs, see #757818"
-		time sudo dd if=/dev/zero of=$LV bs=4096 || true
+		bs=8192
+		let count="1024*1024*1024*$LV/$bs"
+		time sudo dd if=/dev/zero of=$LV bs=$bs count=$count  || true
 	else
 		echo "Release $RELEASE detected, where #757818 should be fixed, thus not applying workaround..."
 	fi
-- 
cgit v1.2.3-70-g09d2


From 08eb420ed367edc1f0a50551054ebaa1412cc3cf Mon Sep 17 00:00:00 2001
From: Steven Chamberlain <steven@pyro.eu.org>
Date: Fri, 14 Nov 2014 14:46:10 +0000
Subject: kfreebsd: preseed keyboard-configuration/xkb-keymap

---
 d-i-preseed-cfgs/debian_sid_daily_kfreebsd_preseed.cfg | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/d-i-preseed-cfgs/debian_sid_daily_kfreebsd_preseed.cfg b/d-i-preseed-cfgs/debian_sid_daily_kfreebsd_preseed.cfg
index c321dc2a..e76ad307 100644
--- a/d-i-preseed-cfgs/debian_sid_daily_kfreebsd_preseed.cfg
+++ b/d-i-preseed-cfgs/debian_sid_daily_kfreebsd_preseed.cfg
@@ -11,8 +11,7 @@ d-i debian-installer/locale string en_US
 #d-i localechooser/supported-locales multiselect en_US.UTF-8, nl_NL.UTF-8
 
 # Keyboard selection.
-# keymap is an alias for keyboard-configuration/xkb-keymap
-d-i keymap select us
+d-i keyboard-configuration/xkb-keymap select us
 # d-i keyboard-configuration/toggle select No toggling
 
 ### Network configuration
-- 
cgit v1.2.3-70-g09d2


From 8f0ba0d6b31bb80cfa2b193716ddb61802e6db11 Mon Sep 17 00:00:00 2001
From: Holger Levsen <holger@layer-acht.org>
Date: Fri, 14 Nov 2014 16:12:03 +0100
Subject: g-i: fixup 28d563df, thanks Steven

---
 bin/g-i-installation.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh
index 660198be..9740f71e 100644
--- a/bin/g-i-installation.sh
+++ b/bin/g-i-installation.sh
@@ -188,7 +188,7 @@ bootstrap_system() {
 	if [ "$RELEASE" != "jessie" ] ; then
 		echo "Workaround to remove swap signature from previous installs, see #757818"
 		bs=8192
-		let count="1024*1024*1024*$LV/$bs"
+		let count="1024*1024*1024*${DISKSIZE_IN_GB}/$bs"
 		time sudo dd if=/dev/zero of=$LV bs=$bs count=$count  || true
 	else
 		echo "Release $RELEASE detected, where #757818 should be fixed, thus not applying workaround..."
-- 
cgit v1.2.3-70-g09d2


From 77500cc82a67b5cbb6e70997e3af4df882593da3 Mon Sep 17 00:00:00 2001
From: Steven Chamberlain <steven@pyro.eu.org>
Date: Fri, 14 Nov 2014 18:33:57 +0000
Subject: kfreebsd preseed: use correct disk device name

---
 d-i-preseed-cfgs/debian_sid_daily_kfreebsd_preseed.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/d-i-preseed-cfgs/debian_sid_daily_kfreebsd_preseed.cfg b/d-i-preseed-cfgs/debian_sid_daily_kfreebsd_preseed.cfg
index e76ad307..9922d8b0 100644
--- a/d-i-preseed-cfgs/debian_sid_daily_kfreebsd_preseed.cfg
+++ b/d-i-preseed-cfgs/debian_sid_daily_kfreebsd_preseed.cfg
@@ -309,7 +309,7 @@ tasksel tasksel/desktop multiselect xfce
 #popularity-contest popularity-contest/participate boolean false
 
 # install grub on the first disk found
-d-i grub-installer/bootdev  string /dev/ada
+d-i grub-installer/bootdev  string /dev/ada0
 
 ### Finishing up the installation
 # During installations from serial console, the regular virtual consoles
-- 
cgit v1.2.3-70-g09d2


From 330af03ebad7b7baaca2907fa26a8dd154987bc4 Mon Sep 17 00:00:00 2001
From: Holger Levsen <holger@layer-acht.org>
Date: Fri, 14 Nov 2014 19:59:28 +0100
Subject: these are not dailies

---
 d-i-preseed-cfgs/debian_jessie_daily_kfreebsd_preseed.cfg | 1 -
 d-i-preseed-cfgs/debian_jessie_kfreebsd_preseed.cfg       | 1 +
 d-i-preseed-cfgs/debian_wheezy_daily_kfreebsd_preseed.cfg | 1 -
 d-i-preseed-cfgs/debian_wheezy_kfreebsd_preseed.cfg       | 1 +
 4 files changed, 2 insertions(+), 2 deletions(-)
 delete mode 120000 d-i-preseed-cfgs/debian_jessie_daily_kfreebsd_preseed.cfg
 create mode 120000 d-i-preseed-cfgs/debian_jessie_kfreebsd_preseed.cfg
 delete mode 120000 d-i-preseed-cfgs/debian_wheezy_daily_kfreebsd_preseed.cfg
 create mode 120000 d-i-preseed-cfgs/debian_wheezy_kfreebsd_preseed.cfg

diff --git a/d-i-preseed-cfgs/debian_jessie_daily_kfreebsd_preseed.cfg b/d-i-preseed-cfgs/debian_jessie_daily_kfreebsd_preseed.cfg
deleted file mode 120000
index f5c7678a..00000000
--- a/d-i-preseed-cfgs/debian_jessie_daily_kfreebsd_preseed.cfg
+++ /dev/null
@@ -1 +0,0 @@
-debian_sid_daily_kfreebsd_preseed.cfg
\ No newline at end of file
diff --git a/d-i-preseed-cfgs/debian_jessie_kfreebsd_preseed.cfg b/d-i-preseed-cfgs/debian_jessie_kfreebsd_preseed.cfg
new file mode 120000
index 00000000..f5c7678a
--- /dev/null
+++ b/d-i-preseed-cfgs/debian_jessie_kfreebsd_preseed.cfg
@@ -0,0 +1 @@
+debian_sid_daily_kfreebsd_preseed.cfg
\ No newline at end of file
diff --git a/d-i-preseed-cfgs/debian_wheezy_daily_kfreebsd_preseed.cfg b/d-i-preseed-cfgs/debian_wheezy_daily_kfreebsd_preseed.cfg
deleted file mode 120000
index f5c7678a..00000000
--- a/d-i-preseed-cfgs/debian_wheezy_daily_kfreebsd_preseed.cfg
+++ /dev/null
@@ -1 +0,0 @@
-debian_sid_daily_kfreebsd_preseed.cfg
\ No newline at end of file
diff --git a/d-i-preseed-cfgs/debian_wheezy_kfreebsd_preseed.cfg b/d-i-preseed-cfgs/debian_wheezy_kfreebsd_preseed.cfg
new file mode 120000
index 00000000..f5c7678a
--- /dev/null
+++ b/d-i-preseed-cfgs/debian_wheezy_kfreebsd_preseed.cfg
@@ -0,0 +1 @@
+debian_sid_daily_kfreebsd_preseed.cfg
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2


From d0dcb5d0d5b15b4feb81fb83febdd415a9df4dfd Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Mon, 17 Nov 2014 18:49:05 +0100
Subject: g-i hurd: Run hurd job every other day

---
 job-cfg/g-i-installation.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/job-cfg/g-i-installation.yaml b/job-cfg/g-i-installation.yaml
index 34815974..d6cbc8ce 100644
--- a/job-cfg/g-i-installation.yaml
+++ b/job-cfg/g-i-installation.yaml
@@ -416,7 +416,7 @@
          my_title: 'Debian (sid daily build CD) LXDE desktop install on Hurd'
          my_shell: '/srv/jenkins/bin/g-i-installation.sh 10 http://people.debian.org/~sthibault/hurd-i386/installer/cdimage/daily/debian-sid-hurd-i386-NETINST-1.iso'
          my_description: 'Do a fully automated installation of Debian LXDE desktop on Hurd - via d-i preseeding (with <a href="https://jenkins.debian.net/d-i-preseed-cfgs/debian_sid_daily_hurd_lxde_preseed.cfg">this preseed.cfg</a>) using netboot gtk.'
-         my_timed: '42 10 * * 1'        # every monday
+         my_timed: '42 10 */2 * *'
          my_recipients: 'holger@layer-acht.org debian-hurd@lists.debian.org'
       - '{name}_debian_sid_daily_rescue':
          my_title: 'Debian (sid daily build CD) rescue mode'
-- 
cgit v1.2.3-70-g09d2


From 482759027ef8d95220176184301191b1b942c9f3 Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Mon, 17 Nov 2014 18:48:31 +0100
Subject: g-i hurd: remove hardcoded alt-f4 simulation

now that we have the serial log
---
 bin/g-i-installation.sh | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh
index 9740f71e..74355978 100644
--- a/bin/g-i-installation.sh
+++ b/bin/g-i-installation.sh
@@ -1120,10 +1120,6 @@ monitor_system() {
 		if [ ! -z "$TRIGGER_MODE" ] && [ "$TRIGGER_MODE" = "$NR" ] ; then
 			let TRIGGER_NR=NR
 		fi
-		# find out why hurd hangs
-		if [ $NR -eq 5100 ] && [[ "$NAME" =~ ^debian.*_hurd.*$ ]] ; then
-			do_and_report key alt-f4
-		fi
 		let NR=NR+1
 		sleep 2
 	done
-- 
cgit v1.2.3-70-g09d2


From 7562396d09e39cc681366827513fd9b4ed8f3135 Mon Sep 17 00:00:00 2001
From: Holger Levsen <holger@layer-acht.org>
Date: Tue, 18 Nov 2014 01:35:30 +0100
Subject: reproducible: no need to guess anymore

---
 bin/.reproducible_scheduler.sh.swp | Bin 0 -> 16384 bytes
 bin/reproducible_common.sh         |   3 +--
 2 files changed, 1 insertion(+), 2 deletions(-)
 create mode 100644 bin/.reproducible_scheduler.sh.swp

diff --git a/bin/.reproducible_scheduler.sh.swp b/bin/.reproducible_scheduler.sh.swp
new file mode 100644
index 00000000..ef20cb50
Binary files /dev/null and b/bin/.reproducible_scheduler.sh.swp differ
diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh
index 8fe2f96c..6f1324d2 100755
--- a/bin/reproducible_common.sh
+++ b/bin/reproducible_common.sh
@@ -142,7 +142,6 @@ init_html() {
 	COUNT_GOOD=$(sqlite3 -init $INIT $PACKAGES_DB "SELECT COUNT(name) FROM source_packages WHERE status = \"reproducible\"")
 	PERCENT_TOTAL=$(echo "scale=1 ; ($COUNT_TOTAL*100/$AMOUNT)" | bc)
 	PERCENT_GOOD=$(echo "scale=1 ; ($COUNT_GOOD*100/$COUNT_TOTAL)" | bc)
-	GUESS_GOOD=$(echo "$PERCENT_GOOD*$AMOUNT/100" | bc)
 	BUILDINFO_SIGNS=true
 }
 
@@ -194,7 +193,7 @@ write_page_header() {
 	if [ "$1" = "$MAINVIEW" ] ; then
 		write_page "<p>These pages contain results obtained from <a href=\"$JENKINS_URL/view/reproducible\">several jobs running on jenkins.debian.net</a>. Thanks to <a href=\"https://www.profitbricks.com\">Profitbricks</a> for donating the virtual machine it's running on!</p>"
 	fi
-	write_page "<p>$COUNT_TOTAL packages have been attempted to be build so far, that's $PERCENT_TOTAL% of $AMOUNT source packages in Debian $SUITE currently. Out of these, $PERCENT_GOOD% were successful, so quite wildly guessing this roughy means about $GUESS_GOOD <a href=\"https://wiki.debian.org/ReproducibleBuilds\">packages should be reproducibly buildable!</a>"
+	write_page "<p>$COUNT_TOTAL packages have been attempted to be build so far, that's $PERCENT_TOTAL% of $AMOUNT source packages in Debian $SUITE currently. Out of these, $COUNT_GOOD packagea ($PERCENT_GOOD%) <a href=\"https://wiki.debian.org/ReproducibleBuilds\">could be built reproducible!</a>"
 	if [ "${1:0:3}" = "all" ] || [ "$1" = "dd-list" ] || [ "$1" = "stats" ] ; then
 		write_page " Join <code>#debian-reproducible</code> on OFTC to get support for making sure your packages build reproducibly too!"
 	fi
-- 
cgit v1.2.3-70-g09d2


From 2c802c7ec958e9ee92ba25427df96370325be799 Mon Sep 17 00:00:00 2001
From: Holger Levsen <holger@layer-acht.org>
Date: Tue, 18 Nov 2014 01:37:31 +0100
Subject: reproducible: never say never again

---
 bin/reproducible_html_indexes.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/reproducible_html_indexes.sh b/bin/reproducible_html_indexes.sh
index 4dc10197..371e206a 100755
--- a/bin/reproducible_html_indexes.sh
+++ b/bin/reproducible_html_indexes.sh
@@ -92,7 +92,7 @@ for VIEW in last_24h last_48h all_abc ; do
 		write_page "<p>"
 		set_icon blacklisted
 		write_icon
-		write_page "$COUNT_BLACKLISTED packages are blacklisted and will never be tested here: <code>"
+		write_page "$COUNT_BLACKLISTED packages are blacklisted and will not be tested here: <code>"
 		link_packages $BLACKLISTED
 		write_page "</code></p>"
 	fi
-- 
cgit v1.2.3-70-g09d2


From 4ad042a29d9146189adfe62eeaa6c930e4764d4a Mon Sep 17 00:00:00 2001
From: Holger Levsen <holger@layer-acht.org>
Date: Tue, 18 Nov 2014 01:52:34 +0100
Subject: reproducible: remove removed packages from db

---
 bin/reproducible_maintainance.sh | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/bin/reproducible_maintainance.sh b/bin/reproducible_maintainance.sh
index f7682245..083d269e 100755
--- a/bin/reproducible_maintainance.sh
+++ b/bin/reproducible_maintainance.sh
@@ -101,6 +101,23 @@ if grep -q '|' $PACKAGES ; then
 fi
 rm $PACKAGES
 
+# find packages which have been removed from sid
+QUERY="SELECT source_packages.name FROM source_packages
+		WHERE source_packages.name NOT IN
+		(SELECT sources.name FROM sources)
+	LIMIT 25"
+PACKAGES=$(sqlite3 -init $INIT ${PACKAGES_DB} "$QUERY")
+if [ -z "$PACKAGES" ] ; then
+	echo
+	echo "Removing these removed packages from database:"
+	echo $PACKAGES
+	QUERY="DELETE FROM source_packages
+			WHERE source_packages.name NOT IN
+			(SELECT sources.name FROM sources)
+		LIMIT 25"
+	sqlite3 -init $INIT ${PACKAGES_DB} "$QUERY"
+fi
+
 if ! $DIRTY ; then
 	echo "Everything seems to be fine."
 	echo
-- 
cgit v1.2.3-70-g09d2


From d12f56371e2cb69ac1e775e3b4cdd76f5876515d Mon Sep 17 00:00:00 2001
From: Holger Levsen <holger@layer-acht.org>
Date: Tue, 18 Nov 2014 01:53:25 +0100
Subject: remove accidently commited .swp file

---
 bin/.reproducible_scheduler.sh.swp | Bin 16384 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 bin/.reproducible_scheduler.sh.swp

diff --git a/bin/.reproducible_scheduler.sh.swp b/bin/.reproducible_scheduler.sh.swp
deleted file mode 100644
index ef20cb50..00000000
Binary files a/bin/.reproducible_scheduler.sh.swp and /dev/null differ
-- 
cgit v1.2.3-70-g09d2


From 1886681112280e17cea4fa0a03c55f0a7e7bfa66 Mon Sep 17 00:00:00 2001
From: Holger Levsen <holger@layer-acht.org>
Date: Tue, 18 Nov 2014 01:58:54 +0100
Subject: reproducible: fix typo

---
 bin/reproducible_maintainance.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bin/reproducible_maintainance.sh b/bin/reproducible_maintainance.sh
index 083d269e..950a8d4a 100755
--- a/bin/reproducible_maintainance.sh
+++ b/bin/reproducible_maintainance.sh
@@ -107,10 +107,11 @@ QUERY="SELECT source_packages.name FROM source_packages
 		(SELECT sources.name FROM sources)
 	LIMIT 25"
 PACKAGES=$(sqlite3 -init $INIT ${PACKAGES_DB} "$QUERY")
-if [ -z "$PACKAGES" ] ; then
+if [ ! -z "$PACKAGES" ] ; then
 	echo
 	echo "Removing these removed packages from database:"
 	echo $PACKAGES
+	echo
 	QUERY="DELETE FROM source_packages
 			WHERE source_packages.name NOT IN
 			(SELECT sources.name FROM sources)
-- 
cgit v1.2.3-70-g09d2


From 38d96c7a8820651e69282151e3adfa584cb2f805 Mon Sep 17 00:00:00 2001
From: Holger Levsen <holger@layer-acht.org>
Date: Tue, 18 Nov 2014 02:14:31 +0100
Subject: reproducible: say never never once again

---
 bin/reproducible_html_graphs.sh | 2 +-
 bin/reproducible_scheduler.sh   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/reproducible_html_graphs.sh b/bin/reproducible_html_graphs.sh
index 14616eac..f975fd32 100755
--- a/bin/reproducible_html_graphs.sh
+++ b/bin/reproducible_html_graphs.sh
@@ -160,7 +160,7 @@ if [ $COUNT_SOURCELESS -gt 0 ] ; then
 fi
 set_icon not_for_us
 write_icon
-write_page "$COUNT_NOTFORUS ($PERCENT_NOTFORUS%) packages which are neither Architecture: 'any', 'all', 'amd64', 'linux-any', 'linux-amd64' nor 'any-amd64' will never be build here"
+write_page "$COUNT_NOTFORUS ($PERCENT_NOTFORUS%) packages which are neither Architecture: 'any', 'all', 'amd64', 'linux-any', 'linux-amd64' nor 'any-amd64' will not be build here"
 write_page "and those "
 set_icon blacklisted
 write_icon
diff --git a/bin/reproducible_scheduler.sh b/bin/reproducible_scheduler.sh
index f17590a0..5922e0ad 100755
--- a/bin/reproducible_scheduler.sh
+++ b/bin/reproducible_scheduler.sh
@@ -91,7 +91,7 @@ select_unknown_packages() {
 				WHERE sources.name=source_packages.name)
 			ORDER BY random()
 		LIMIT $1"
-	do_sql_query "never tested before, randomly sorted"
+	do_sql_query "not tested before, randomly sorted"
 }
 
 select_new_versions() {
-- 
cgit v1.2.3-70-g09d2


From d25175aaa62ed7fa5c44d934349fd17736017b72 Mon Sep 17 00:00:00 2001
From: Holger Levsen <holger@layer-acht.org>
Date: Tue, 18 Nov 2014 02:29:41 +0100
Subject: fix tpoy

---
 bin/reproducible_html_graphs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/reproducible_html_graphs.sh b/bin/reproducible_html_graphs.sh
index f975fd32..02532fc2 100755
--- a/bin/reproducible_html_graphs.sh
+++ b/bin/reproducible_html_graphs.sh
@@ -95,7 +95,7 @@ COLOR[1]=4
 COLOR[2]=3
 COLOR[3]=18
 MAINLABEL[0]="Package reproducibility status"
-MAINLABEL[1]="Amout of packages build each day"
+MAINLABEL[1]="Amount of packages build each day"
 MAINLABEL[2]="Age in days of oldest kind of logfile"
 MAINLABEL[3]="Bugs with usertags for user reproducible-builds@lists.alioth.debian.org"
 YLABEL[0]="Amount (total)"
-- 
cgit v1.2.3-70-g09d2


From e9b5d5af1fde52a271d0e4bee988e458d2b2de11 Mon Sep 17 00:00:00 2001
From: Holger Levsen <holger@layer-acht.org>
Date: Tue, 18 Nov 2014 10:26:19 +0100
Subject: maintainance: ignore /srv/d-i/workspace

---
 bin/maintainance.sh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/bin/maintainance.sh b/bin/maintainance.sh
index 694c964a..047d4f68 100755
--- a/bin/maintainance.sh
+++ b/bin/maintainance.sh
@@ -36,7 +36,12 @@ chroot_checks() {
 
 report_old_directories() {
 	# find and warn about old temp directories
-	OLDSTUFF=$(find $1/* -maxdepth 0 -type d -mtime +$2 -exec ls -lad {} \;)
+	if [ -z "$3" ] ; then
+		OLDSTUFF=$(find $1/* -maxdepth 0 -type d -mtime +$2 -exec ls -lad {} \;)
+	else
+		# if $3 is given, ignore it
+		OLDSTUFF=$(find $1/* -maxdepth 0 -type d -mtime +$2 ! -path "$3*" -exec ls -lad {} \;)
+	fi
 	if [ ! -z "$OLDSTUFF" ] ; then
 		echo "Warning: old temp directories found in $REP_RESULTS"
 		echo "$OLDSTUFF"
@@ -164,7 +169,7 @@ else
 						echo "WARNING: there is no check / handling on stale lvm volumes"
 						rm $ACTIVE_JOBS $WATCHED_JOBS $RUNNING
 						;;
-		d-i)				report_old_directories /srv/d-i 7
+		d-i)				report_old_directories /srv/d-i 7 /srv/d-i/workspace
 						;;
 		squid)				report_squid_usage
 						;;
-- 
cgit v1.2.3-70-g09d2