Remove extra debug output

This commit is contained in:
Denis Silakov 2013-10-07 10:45:18 +04:00
parent ddd6994951
commit e30206911c
2 changed files with 1 additions and 67 deletions

View file

@ -22,75 +22,9 @@ diff -Naur rpm-5.4.10.orig/macros/mandriva.in rpm-5.4.10/macros/mandriva.in
# This will die as soon as remaining usage has been phased out... # This will die as soon as remaining usage has been phased out...
%mkrel(c:) %{-c: 0.%{-c*}.}%{1}%{?subrel:.%subrel} %mkrel(c:) %{-c: 0.%{-c*}.}%{1}%{?subrel:.%subrel}
%manbo_mkrel() %mkrel %manbo_mkrel() %mkrel
diff -Naur rpm-5.4.10.orig/rpmio/rpmio.c rpm-5.4.10/rpmio/rpmio.c
--- rpm-5.4.10.orig/rpmio/rpmio.c 2013-09-17 17:34:34.808808860 +0400
+++ rpm-5.4.10/rpmio/rpmio.c 2013-10-03 18:01:27.604461112 +0400
@@ -2836,21 +2836,27 @@
int flags = 0;
FD_t fd = NULL;
- if (path == NULL || _fmode == NULL)
+ if (path == NULL || _fmode == NULL) {
+ fprintf(stderr, "==> FAILED Fopen\n");
goto exit;
+ }
/*@-globs -mods@*/
fmode = rpmExpand(_fmode, NULL);
/*@=globs =mods@*/
-if (_rpmio_debug)
+/*if (_rpmio_debug)*/
fprintf(stderr, "==> Fopen(%s, %s)\n", path, fmode);
stdio[0] = '\0';
cvtfmode(fmode, stdio, sizeof(stdio), other, sizeof(other), &end, &flags);
- if (stdio[0] == '\0')
+ if (stdio[0] == '\0') {
+ fprintf(stderr, "==> FAILED2 Fopen\n");
goto exit;
+ }
+
if (end == NULL || !strcmp(end, "fdio")) {
+ fprintf(stderr, "==> PROC2 Fopen\n");
fd = fdOpen(path, flags, perms);
if (fdFileno(fd) < 0) {
if (fd) (void) fdClose(fd);
@@ -2858,6 +2864,7 @@
goto exit;
}
} else {
+ fprintf(stderr, "==> PROC1 Fopen\n");
FILE *fp;
int fdno;
int isHTTP = 0;
@@ -2894,12 +2901,15 @@
&& ((fdno = fdGetFdno(fd)) >= 0 || fd->req != NULL))
{
/*@+voidabstract@*/
+ fprintf(stderr, "==> PROC3 Fopen\n");
fdPush(fd, fpio, fp, fileno(fp)); /* Push fpio onto stack */
/*@=voidabstract@*/
goto exit;
}
}
+ fprintf(stderr, "==> PROC4 Fopen\n");
+
if (fd)
fd = Fdopen(fd, fmode);
exit:
diff -Naur rpm-5.4.10.orig/rpmio/url.c rpm-5.4.10/rpmio/url.c diff -Naur rpm-5.4.10.orig/rpmio/url.c rpm-5.4.10/rpmio/url.c
--- rpm-5.4.10.orig/rpmio/url.c 2013-09-17 17:34:34.827808860 +0400 --- rpm-5.4.10.orig/rpmio/url.c 2013-09-17 17:34:34.827808860 +0400
+++ rpm-5.4.10/rpmio/url.c 2013-10-03 17:49:34.590394849 +0400 +++ rpm-5.4.10/rpmio/url.c 2013-10-03 17:49:34.590394849 +0400
@@ -3,6 +3,7 @@
*/
#include "system.h"
+#include "stdio.h"
#include <netinet/in.h>
@@ -446,6 +447,7 @@ @@ -446,6 +447,7 @@
/*@-observertrans@*/ /*@-observertrans@*/
if (pathp) if (pathp)

View file

@ -59,7 +59,7 @@ Summary: The RPM package management system
Name: rpm Name: rpm
Epoch: 1 Epoch: 1
Version: %{libver}.%{minorver} Version: %{libver}.%{minorver}
Release: %{?prereldate:0.%{prereldate}.}16 Release: %{?prereldate:0.%{prereldate}.}17
License: LGPLv2.1+ License: LGPLv2.1+
Group: System/Configuration/Packaging Group: System/Configuration/Packaging
URL: http://rpm5.org/ URL: http://rpm5.org/