sync

diff --git a/TODO b/TODO
index 33b5c54ded3de8b975e3ef9644b764597a6cbd4b..37d8560b40b06735ed067a60957f3e83c37b4001 100644 (file)
--- a/TODO
+++ b/TODO
@@ -22,8 +22,22 @@ TODO:
 
  o update tagdb.dia
 
-==========================================================================
+ o clean fingerprint
+
+ o fix up cron.weekly and/or shania
 
+Lisa:
+
+ o installing into stable
+ o warn about other components
+ o priority >> optional
+ o arch != {any,all}
+ o build-depends wrong (via andrea)
+ o suid
+ o conficlits
+ o notification/stats to admin daily
+
+==========================================================================
 
 To fix
 ======
@@ -103,6 +117,8 @@ Less Urgent
     o catherine should udpate db; move files, not the other way around [neuro]
     o melanie should update the stable changelog [joey]
   
+
+
  * Bizzare/uncertain:
    
     o validate source consistency, i.e. .dsc and .tar.gz as minimum (??)

diff --git a/cron.unchecked b/cron.unchecked
new file mode 100644 (file)
index 0000000..5f46244
--- /dev/null
+++ b/cron.unchecked
@@ -0,0 +1,19 @@
+#! /bin/sh
+
+set -e
+export SCRIPTVARS=/org/ftp-master.debian.org/katie/vars
+. $SCRIPTVARS
+
+cd $unchecked
+
+changes=$(find . -maxdepth 1 -mindepth 1 -type f -name \*.changes | sed -e "s,./,," | xargs)
+report=$queuedir/REPORT
+timestamp=$(date "+%Y-%m-%d %H:%M")
+
+if [ ! -z "$changes" ]; then
+  echo "$timestamp": "$changes"  >> $report
+  jennifer -a $changes >> $report
+  echo "--" >> $report
+else
+  echo "$timestamp": Nothing to do >> $report
+fi;

diff --git a/katie.conf b/katie.conf
index 5e91a2cf64555f104c65321180462410d245b60d..ef0a1e61d4c775427c5391553ae36722242523e4 100644 (file)
--- a/katie.conf
+++ b/katie.conf
@@ -293,7 +293,7 @@ Dir
   QueueNewDir "/org/ftp.debian.org/queue/new/";
   QueueRejectDir "/org/ftp.debian.org/queue/reject/";
   QueueUncheckedDir "/org/ftp.debian.org/queue/unchecked/";
-  UrgencyLogDir "/org/ftp.debian.org/testing/";
+  UrgencyLogDir "/org/ftp.debian.org/testing/urgencies/";
 };
 
 DB

diff --git a/vars b/vars
index d3eb2fd2fdf9374a9436c7fc58b09fec39be1be9..5d40443ae06db242f4283fb9206a2860bf495719 100644 (file)
--- a/vars
+++ b/vars
@@ -1,16 +1,20 @@
 # locations used by many scripts
 
-ftpdir=/org/ftp.debian.org/ftp
-webdir=/org/ftp.debian.org/web
+base=/org/ftp.debian.org
+ftpdir=$base/ftp
+webdir=$base/web
 indices=$ftpdir/indices
 archs="alpha arm hppa hurd-i386 i386 ia64 m68k powerpc sparc mips mipsel sh"
 
-scriptdir=/org/ftp.debian.org/scripts
-masterdir=/org/ftp.debian.org/katie/
-dbdir=/org/ftp.debian.org/database/
+scriptdir=$base/scripts
+masterdir=$base/katie/
+dbdir=$base/database/
 overridedir=$scriptdir/override
 
-incoming=/org/ftp.debian.org/incoming
+queuedir=$base/queue/
+unchecked=$queuedir/unchecked/
+accepted=$queuedir/accepted/
+incoming=$base/incoming
 
 ftpgroup=debadmin