[Debian-l10n-commits] ddtp branch master updated. 20080812.0-140-g6d7fd45
Martijn van Oosterhout
kleptog-guest at moszumanska.debian.org
Sat Jan 18 16:06:00 UTC 2014
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "ddtp".
The branch, master has been updated
via 6d7fd457998ee337d1d8833fe297709e32d7150a (commit)
via 860e563a1307456a64e039b0d4c881ea9f754a87 (commit)
via 06d3644936b75e66be62bf6b9defbbf915fc1d65 (commit)
via 7354497c24559afaa1a598944a0c3b39128988cf (commit)
from 756d7ea6b15139b6713c2cb2a7578aedc23a3656 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://anonscm.debian.org/gitweb/?p=debian-l10n/ddtp.git;a=commitdiff;h=6d7fd457998ee337d1d8833fe297709e32d7150a
commit 6d7fd457998ee337d1d8833fe297709e32d7150a
Author: Martijn van Oosterhout <kleptog at svana.org>
Date: Sat Jan 18 16:00:52 2014 +0000
Keep weekly dumps instad of daily, for disk space.
http://anonscm.debian.org/gitweb/?p=debian-l10n/ddtp.git;a=commitdiff;h=860e563a1307456a64e039b0d4c881ea9f754a87
commit 860e563a1307456a64e039b0d4c881ea9f754a87
Author: Martijn van Oosterhout <kleptog at svana.org>
Date: Sat Jan 18 15:59:34 2014 +0000
Fix UTF-8 check now Encode::decode_utf8 apparently clobbers argument.
http://anonscm.debian.org/gitweb/?p=debian-l10n/ddtp.git;a=commitdiff;h=06d3644936b75e66be62bf6b9defbbf915fc1d65
commit 06d3644936b75e66be62bf6b9defbbf915fc1d65
Author: Martijn van Oosterhout <kleptog at svana.org>
Date: Sat Jan 18 15:59:03 2014 +0000
Set the From/Sender correctly in outgoing email.
http://anonscm.debian.org/gitweb/?p=debian-l10n/ddtp.git;a=commitdiff;h=7354497c24559afaa1a598944a0c3b39128988cf
commit 7354497c24559afaa1a598944a0c3b39128988cf
Author: Martijn van Oosterhout <kleptog at svana.org>
Date: Sat Jan 18 15:57:37 2014 +0000
Use the gz files rather than bz2 now that bz2 has been removed.
-----------------------------------------------------------------------
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
-----------------------------------------------------------------------
hooks/post-receive
--
ddtp
More information about the Debian-l10n-commits
mailing list