Author: pebender
Date: Thu Jan 22 12:35:48 2009
New Revision: 4305
Modified:
trunk/gar-minimyth/html/minimyth/document-changelog.txt
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/functions
trunk/gar-minimyth/script/perl/perl-MiniMyth/checksums
trunk/gar-minimyth/script/perl/perl-MiniMyth/files/MiniMyth.pm
Log:
- Changed http gets and puts so that they follow redirects as they did
before switching from using wget to using curl.
Modified: trunk/gar-minimyth/html/minimyth/document-changelog.txt
==============================================================================
--- trunk/gar-minimyth/html/minimyth/document-changelog.txt (original)
+++ trunk/gar-minimyth/html/minimyth/document-changelog.txt Thu Jan 22
12:35:48 2009
@@ -1,7 +1,7 @@
MiniMyth Changelog
--------------------------------------------------------------------------------
-Changes since 63 (2009-01-21):
+Changes since 63 (2009-01-22):
Current MythTV versions
MythTV 0.20-softpad: version 0.20.2.softpad, release-0-20-fixes branch
svn 16082,
@@ -92,6 +92,8 @@
gid's that are already correctly set. This reduces the number of
files
that are copied from the read-only branch to the read-write branch of
the unionfs union.
+ - Changed http gets and puts so that they follow redirects as they did
+ before switching from using wget to using curl.
Modified udev
- Renamed 06-minimyth-mythtv.rules to 07-minimyth-mythtv.rules.
Modified:
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/functions
==============================================================================
---
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/functions
(original)
+++
trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d.sh/functions
Thu Jan 22 12:35:48 2009
@@ -242,7 +242,7 @@
/usr/bin/test -n "${LOCAL_DIR}" && /bin/mkdir -p "${LOCAL_DIR}"
/usr/bin/test -n "${LOCAL_DIR}" && /usr/bin/test ! -d "${LOCAL_DIR}"
&& return
- /usr/bin/curl -s -f "http://${REMOTE_SERVER}${REMOTE_FILE}";
-o "${LOCAL_FILE}" || return
+ /usr/bin/curl -L -s -f "http://${REMOTE_SERVER}${REMOTE_FILE}";
-o "${LOCAL_FILE}" || return
/usr/bin/logger -s -t minimyth
-p "local0.info" "'http://${REMOTE_SERVER}${REMOTE_FILE}' downloaded."
@@ -423,7 +423,7 @@
return
fi
- if /usr/bin/curl -s -f
-T "${LOCAL_FILE}" "http://${REMOTE_SERVER}${REMOTE_FILE}"; ; then
+ if /usr/bin/curl -L -s -f
-T "${LOCAL_FILE}" "http://${REMOTE_SERVER}${REMOTE_FILE}"; ; then
/usr/bin/logger -s -t minimyth -p "local0.info" \
"'http://${REMOTE_SERVER}${REMOTE_FILE}' posted."
/bin/true
Modified: trunk/gar-minimyth/script/perl/perl-MiniMyth/checksums
==============================================================================
--- trunk/gar-minimyth/script/perl/perl-MiniMyth/checksums (original)
+++ trunk/gar-minimyth/script/perl/perl-MiniMyth/checksums Thu Jan 22
12:35:48 2009
@@ -1 +1 @@
-c0a89c740daf3662253f1d21e0ea3c2b download/MiniMyth.pm
+b3c915170eba38146b0b659bf8ccf615 download/MiniMyth.pm
Modified: trunk/gar-minimyth/script/perl/perl-MiniMyth/files/MiniMyth.pm
==============================================================================
--- trunk/gar-minimyth/script/perl/perl-MiniMyth/files/MiniMyth.pm
(original)
+++ trunk/gar-minimyth/script/perl/perl-MiniMyth/files/MiniMyth.pm Thu Jan
22 12:35:48 2009
@@ -12,7 +12,7 @@
use File::Path ();
use File::Spec ();
use Net::Telnet ();
-use WWW::Curl::Easy qw(CURLINFO_HTTP_CODE CURLOPT_INFILE
CURLOPT_INFILESIZE CURLOPT_PUT CURLOPT_UPLOAD CURLOPT_URL CURLOPT_VERBOSE
CURLOPT_WRITEDATA);
+use WWW::Curl::Easy qw(CURLINFO_HTTP_CODE CURLOPT_FOLLOWLOCATION
CURLOPT_INFILE CURLOPT_INFILESIZE CURLOPT_PUT CURLOPT_UPLOAD CURLOPT_URL
CURLOPT_VERBOSE CURLOPT_WRITEDATA);
sub new
{
@@ -1242,6 +1242,7 @@
my $curl = new WWW::Curl::Easy;
$curl->setopt(CURLOPT_VERBOSE, 0);
$curl->setopt(CURLOPT_URL, $url_item);
+ $curl->setopt(CURLOPT_FOLLOWLOCATION, 1);
$curl->setopt(CURLOPT_WRITEDATA, $OUT_FILE);
my $retcode = $curl->perform;
close($OUT_FILE);
@@ -1363,6 +1364,7 @@
my $curl = new WWW::Curl::Easy;
$curl->setopt(CURLOPT_VERBOSE, 0);
$curl->setopt(CURLOPT_URL, $url_item);
+ $curl->setopt(CURLOPT_FOLLOWLOCATION, 1);
$curl->setopt(CURLOPT_INFILE, $IN_FILE);
$curl->setopt(CURLOPT_INFILESIZE,
$local_file_size);
$curl->setopt(CURLOPT_WRITEDATA, $OUT_FILE);
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"minimyth-commits" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/minimyth-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
