r27592 - in /trunk/libflickr-upload-perl/debian: changelog patches/failupload.patch

[alexm-guest at users.alioth.debian.org]

Author: alexm-guest
Date: Mon Dec  1 20:13:35 2008
New Revision: 27592

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=27592
Log:
Merge with upstream version of debian/patches/failupload.patch.

Modified:
    trunk/libflickr-upload-perl/debian/changelog
    trunk/libflickr-upload-perl/debian/patches/failupload.patch

Modified: trunk/libflickr-upload-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libflickr-upload-perl/debian/changelog?rev=27592&op=diff
==============================================================================
--- trunk/libflickr-upload-perl/debian/changelog (original)
+++ trunk/libflickr-upload-perl/debian/changelog Mon Dec  1 20:13:35 2008
@@ -1,7 +1,12 @@
 libflickr-upload-perl (1.32-3) UNRELEASED; urgency=low
 
+  [ gregor herrmann ]
   * debian/control: Changed: Switched Vcs-Browser field to ViewSVN
     (source stanza).
+
+  [ Alex Muntada ]
+  * debian/patches/failupload.patch: Updated per upstream author's
+    advice (status code returned should be ignored).
 
  -- gregor herrmann <gregoa at debian.org>  Sun, 16 Nov 2008 20:43:05 +0100
 

Modified: trunk/libflickr-upload-perl/debian/patches/failupload.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libflickr-upload-perl/debian/patches/failupload.patch?rev=27592&op=diff
==============================================================================
--- trunk/libflickr-upload-perl/debian/patches/failupload.patch (original)
+++ trunk/libflickr-upload-perl/debian/patches/failupload.patch Mon Dec  1 20:13:35 2008
@@ -1,5 +1,7 @@
 Author: Alex Muntada <alexm at alexm.org>
 Description: Fixes dubious test when network is unavailable
+    Already merged upstream in
+    http://gitorious.org/projects/flickrupload/repos/mainline/commits/687838e8b1f5a8d1d533ae10a04b7aa72be4b539
 
 --- a/Upload.pm
 +++ b/Upload.pm
@@ -7,7 +9,7 @@
  
  	my $res = $self->request( $req );
  
-+    return () unless defined $res && $res->is_success;
++	return () unless defined $res;
 +
  	my $tree = XML::Parser::Lite::Tree::instance()->parse($res->decoded_content());
  	return () unless defined $tree;