From: Joerg Jaspert <joerg@debian.org>
Date: Fri, 2 Jan 2009 23:13:16 +0000 (+0100)
Subject: Merge commit 'ncomm/dm_upload_allowed' into merge
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=57fa15b165bf7cc4ce4f551a43b78cd9ba28460d;hp=cd85185804d716e070b8d9713140f6749d93b68d;p=dak.git

Merge commit 'ncomm/dm_upload_allowed' into merge

* commit 'ncomm/dm_upload_allowed':
  Removed excess -D option from byhand-dm

Signed-off-by: Joerg Jaspert <joerg@debian.org>
---

diff --git a/scripts/debian/byhand-dm b/scripts/debian/byhand-dm
index 37438805..da7ddd44 100755
--- a/scripts/debian/byhand-dm
+++ b/scripts/debian/byhand-dm
@@ -41,7 +41,7 @@ echo "Authorised upload by $ID, copying into place"
 OUT=$(mktemp)
 
 cp "$BYHAND" "$DESTKR"
-dak import-keyring -D --generate-users "%s" "$DESTKR" >$OUT
+dak import-keyring --generate-users "%s" "$DESTKR" >$OUT
 
 if [ -s "$OUT" ]; then
   /usr/sbin/sendmail -odq -oi -t <<EOF