[Debian-l10n-commits] [ddtp] branch master updated (756d7ea -> 6d7fd45)

[Martijn van Oosterhout]

This is an automated email from the git hooks/post-receive script.

kleptog-guest pushed a change to branch master
in repository ddtp.

      from  756d7ea   Fix base so you stay in HTTPS once there.
       new  7354497   Use the gz files rather than bz2 now that bz2 has been removed.
       new  06d3644   Set the From/Sender correctly in outgoing email.
       new  860e563   Fix UTF-8 check now Encode::decode_utf8 apparently clobbers argument.
       new  6d7fd45   Keep weekly dumps instad of daily, for disk space.

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 Packages2packages_tb.sh | 14 +++++++-------
 ddts/bin/mailparser.pl  |  2 ++
 ddtss/ddtss-cgi         | 15 +++++++++++++++
 logrotate.config        |  4 ++--
 4 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/Packages2packages_tb.sh b/Packages2packages_tb.sh
index b40fbdd..8f52a8a 100755
--- a/Packages2packages_tb.sh
+++ b/Packages2packages_tb.sh
@@ -31,14 +31,14 @@ do
 			file="Packages/Packages_${distribution}_${part}_${arch}"
 
 			echo `date`: ${distribution}/${part}/$arch
-			[ -s $file.bz2 ] && mv $file.bz2 Packages/Packages.bz2
+			[ -s $file.gz ] && mv $file.gz Packages/Packages.gz
 			wget -P Packages -q -m -nd \
-			    http://ftp.de.debian.org/debian/dists/${distribution}/${part}/binary-$arch/Packages.bz2 && {
-				echo `date`: Packages file downloaded
+			    http://ftp.de.debian.org/debian/dists/${distribution}/${part}/binary-$arch/Packages.gz && {
+				echo `date`: http://ftp.de.debian.org/debian/dists/${distribution}/${part}/binary-$arch/Packages.gz file downloaded
 			} || {
-				echo `date`: Failed to download ${distribution}/${part}/$arch 1>&2
+				echo `date`: Failed to download ${distribution}/${part}/$arch "(http://ftp.de.debian.org/debian/dists/${distribution}/${part}/binary-$arch/Packages.gz)" 1>&2
 			}
-			[ -s Packages/Packages.bz2 ] && mv Packages/Packages.bz2 $file.bz2
+			[ -s Packages/Packages.gz ] && mv Packages/Packages.gz $file.gz
 		done
 	done
 done
@@ -53,7 +53,7 @@ do
 
 		for arch in $DISTS
 		do
-			file="Packages/Packages_${distribution}_${part}_${arch}.bz2"
+			file="Packages/Packages_${distribution}_${part}_${arch}.gz"
 
 			# Skip files older than 2 days...
 			if [ -n "$(find "$file" -mtime +2)" ] ; then
@@ -61,7 +61,7 @@ do
 				continue
 			fi
 			[ -f $file ] && echo -n `date`: $file
-			[ -f $file ] && bzcat $file | $INPORT2DB
+			[ -f $file ] && zcat $file | $INPORT2DB
 			[ -f $file ] || echo no $file
 		done
 
diff --git a/ddts/bin/mailparser.pl b/ddts/bin/mailparser.pl
index 1da840d..2ea9f12 100755
--- a/ddts/bin/mailparser.pl
+++ b/ddts/bin/mailparser.pl
@@ -1229,9 +1229,11 @@ sub mailparser () {
 	#
 	# Create mail answer
 	#
+	my $server_from_address = 'pdesc at ddtp.debian.net';
 	my $mail_out = build MIME::Entity::				# build mail header
 			Type		=> "multipart/mixed",
 			From		=> $server_from_address,
+			Sender		=> $server_from_address,
 			To		=> $from,
 			Bcc		=> "$log_address{$lang_postfix}, $server_log_address",
 			Subject		=> "nothing",
diff --git a/ddtss/ddtss-cgi b/ddtss/ddtss-cgi
index 363cf63..c5e841e 100755
--- a/ddtss/ddtss-cgi
+++ b/ddtss/ddtss-cgi
@@ -1041,7 +1041,9 @@ sub forexternalreview_display
   { display_error( "Fetched description didn't contain package name" ) }
   
   eval {
+    my $temp = $data;
     my $str = Encode::decode_utf8($data, Encode::FB_CROAK);
+    $data = $temp;
   };
   if($@)
   {
@@ -1456,8 +1458,12 @@ sub submit_externalreview
   $long =~ s/^/ /mg; # Insert leading space
 
   eval {
+    my $tempshort = $short;
+    my $templong = $long;
     my $shortx = Encode::decode_utf8($short, Encode::FB_CROAK);
     my $longx = Encode::decode_utf8($long, Encode::FB_CROAK);
+    $short = $tempshort;
+    $long = $templong;
     
     if( length($shortx) > 80 or $longx =~ /^.{80}/m )
     {
@@ -1498,7 +1504,9 @@ sub submit_externalreview
   { return( "Fetched description didn't contain package name" ) }
   
   eval {
+    my $temp = $data;
     my $str = Encode::decode_utf8($data, Encode::FB_CROAK);
+    $data = $temp;
   };
   if($@)
   {
@@ -1568,8 +1576,12 @@ sub submit_translation
   }
   
   eval {
+    my $tempshort = $short;
+    my $templong = $long;
     my $shortx = Encode::decode_utf8($short, Encode::FB_CROAK);
     my $longx = Encode::decode_utf8($long, Encode::FB_CROAK);
+    $short = $tempshort;
+    $long = $templong;
     
     if( length($shortx) > 80 or $longx =~ /^.{80}/m )
     {
@@ -1752,7 +1764,9 @@ sub fetch_translation
   $package = $fetch_package;
   
   eval {
+    my $temp = $data;
     my $str = Encode::decode_utf8($data, Encode::FB_CROAK);
+    $data = $temp;
   };
   if($@)
   {
@@ -1890,6 +1904,7 @@ sub display_createlogin
 
     my $email = MIME::Entity->build( Type => 'text/plain',
                                      From => $from,
+                                     Sender => $from,
                                      To => $email,
 #                                    To => "<ddtss\@kleptog.org>",
                                      Subject => 'Confirm DDTSS account',
diff --git a/logrotate.config b/logrotate.config
index 994b146..3fd50de 100644
--- a/logrotate.config
+++ b/logrotate.config
@@ -1,7 +1,7 @@
 /org/ddtp.debian.net/pg_dump/pg_ddts.dump.gz {
-	daily
+	weekly
 	missingok
-	rotate 52
+	rotate 8
 	nocompress
 	notifempty
 	#create 640 ddtp debian-i18n-users

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-l10n/ddtp.git