ctanupload (7may12)

git-svn-id: svn://tug.org/texlive/trunk@26252 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 9 insertions, 2 deletions

diff --git a/Master/texmf-dist/scripts/ctanupload/ctanupload.pl b/Master/texmf-dist/scripts/ctanupload/ctanupload.pl
index 716bc24b2aa..e39c3d21237 100755
--- a/Master/texmf-dist/scripts/ctanupload/ctanupload.pl
+++ b/Master/texmf-dist/scripts/ctanupload/ctanupload.pl
@@ -10,7 +10,7 @@ sub fromenv;
 sub load_data;
 sub save_data;
 
-my $VERSION = 'v1.2a from 2012/05/03';
+my $VERSION = 'v1.2b from 2012/05/06';
 my %CTAN_SERVERURLS = (
     dante     => 'http://dante.ctan.org/upload.html',
     uktug     => 'http://www.tex.ac.uk/upload/',
@@ -343,10 +343,17 @@ if ($FIELDS{DoNotAnnounce}) {
     $DoNotAnnounce = '[x]';
 }
 else {
-    delete $FIELDS{DoNotAnnounce};
+    $FIELDS{DoNotAnnounce} = 'Yes';
     delete $FIELDS{to_announce};
     $DoNotAnnounce = '[ ]';
 }
+# Only keep the announcement field used by the site:
+if ($CTAN_URL eq $CTAN_SERVERURLS{dante}) {
+    delete $FIELDS{to_announce};
+}
+else {
+    delete $FIELDS{DoNotAnnounce};
+}
 
 if (!$FIELDS{directory}) {
     $FIELDS{directory} = '/macros/latex/contrib/' . $FIELDS{contribution};