packages: poldek/poldek-git.patch, poldek/poldek.spec - rel 5; kill 404 err...

cactus cactus at pld-linux.org
Fri Mar 23 11:44:28 CET 2012


Author: cactus                       Date: Fri Mar 23 10:44:28 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 5; kill 404 errors when verbose killed

---- Files affected:
packages/poldek:
   poldek-git.patch (1.6 -> 1.7) , poldek.spec (1.441 -> 1.442) 

---- Diffs:

================================================================
Index: packages/poldek/poldek-git.patch
diff -u packages/poldek/poldek-git.patch:1.6 packages/poldek/poldek-git.patch:1.7
--- packages/poldek/poldek-git.patch:1.6	Wed Mar 21 21:51:22 2012
+++ packages/poldek/poldek-git.patch	Fri Mar 23 11:44:22 2012
@@ -83,3 +83,37 @@
      # hash text between =xxxstart and =xxxend
      perl -ne 's/^\s+(=xxx\w+)/$1/; $in = 1 if /^=xxxstart/; $in = 0 if /^=xxxend/; if ($in) { s/^\s+([^#])/# $1/; }; print if $_ !~ /^=/' |
      # remove unneeded leading lines and lines with =remove tag
+commit 11f27d85144a575cfe27a22d72c3816d36e7a754
+Author: Bartlomiej Zimon <uzi18 at o2.pl>
+Date:   Fri Mar 23 13:37:06 2012 +0100
+
+    - http: shut up 404 errors when verbose = 0
+    
+    Signed-off-by: Bartlomiej Zimon <uzi18 at o2.pl>
+
+diff --git a/vfile/vfff/http.c b/vfile/vfff/http.c
+index b85db3a..f233b1a 100644
+--- a/vfile/vfff/http.c
++++ b/vfile/vfff/http.c
+@@ -44,6 +44,7 @@
+ #include <sigint/sigint.h>
+ 
+ #include "vfff.h"
++#include "../vfile_intern.h" // for verbose level
+ #include "i18n.h"
+ #include "sigint/sigint.h"
+ 
+@@ -674,8 +675,11 @@ static int status_code_ok(int status_code, const char *msg, const char *path)
+             is_err = 0;
+             break;
+             
+-        case HTTP_STATUS_NOT_FOUND: 
+-            vfff_set_err(ENOENT, _("%s: no such file"), path);
++        case HTTP_STATUS_NOT_FOUND:
++            if (*vfile_conf.verbose > 0) // kill error if verbose = 0
++                vfff_set_err(ENOENT, _("%s: no such file"), path);
++            else
++                is_err = 0;
+             break;
+             
+         case HTTP_STATUS_FORBIDDEN:

================================================================
Index: packages/poldek/poldek.spec
diff -u packages/poldek/poldek.spec:1.441 packages/poldek/poldek.spec:1.442
--- packages/poldek/poldek.spec:1.441	Thu Mar 22 22:40:09 2012
+++ packages/poldek/poldek.spec	Fri Mar 23 11:44:22 2012
@@ -18,7 +18,7 @@
 %define	ver_rpm	4.5-49
 
 %define		snap	rc5
-%define		rel	4
+%define		rel	5
 Summary:	RPM packages management helper tool
 Summary(hu.UTF-8):	RPM csomagkezelést segítő eszköz
 Summary(pl.UTF-8):	Pomocnicze narzędzie do zarządzania pakietami RPM
@@ -497,6 +497,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.442  2012/03/23 10:44:22  cactus
+- rel 5; kill 404 errors when verbose killed
+
 Revision 1.441  2012/03/22 21:40:09  glen
 - BR xmlto again (removed in r1.391)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/poldek/poldek-git.patch?r1=1.6&r2=1.7
    http://cvs.pld-linux.org/packages/poldek/poldek.spec?r1=1.441&r2=1.442



More information about the pld-cvs-commit mailing list