SOURCES (AC-branch): rpm-truncate-cvslog.patch - allow incomplete ...

glen glen at pld-linux.org
Sat Apr 29 15:32:53 CEST 2006


Author: glen                         Date: Sat Apr 29 13:32:53 2006 GMT
Module: SOURCES                       Tag: AC-branch
---- Log message:
- allow incomplete changelog (first spec without proper cvslog)

---- Files affected:
SOURCES:
   rpm-truncate-cvslog.patch (1.1.2.2 -> 1.1.2.3) 

---- Diffs:

================================================================
Index: SOURCES/rpm-truncate-cvslog.patch
diff -u SOURCES/rpm-truncate-cvslog.patch:1.1.2.2 SOURCES/rpm-truncate-cvslog.patch:1.1.2.3
--- SOURCES/rpm-truncate-cvslog.patch:1.1.2.2	Thu Apr 27 09:55:47 2006
+++ SOURCES/rpm-truncate-cvslog.patch	Sat Apr 29 15:32:48 2006
@@ -19,7 +19,7 @@
  
      s = getStringBuf(sb);
  
-@@ -197,6 +202,43 @@
+@@ -197,6 +202,42 @@
  	while ((s > text) && xisspace(*s)) {
  	    *s-- = '\0';
  	}
@@ -28,13 +28,11 @@
 +	    /* find end of line */
 +	    while(*s && *s != '\n') s++;
 +	    if (!*s) {
-+		rpmError(RPMERR_BADSPEC, _("incomplete %%changelog entry\n"));
-+		return RPMERR_BADSPEC;
++		goto out;
 +	    }
 +	    s++;
 +	    if (!*s) {
-+		rpmError(RPMERR_BADSPEC, _("incomplete %%changelog entry\n"));
-+		return RPMERR_BADSPEC;
++		goto out;
 +	    }
 +
 +	    /* we reached place where first Revisions should be */
@@ -60,6 +58,7 @@
 +		}
 +	    }
 +	}
++out:
  	
  	addChangelogEntry(h, time, name, text);
  	s = next;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/rpm-truncate-cvslog.patch?r1=1.1.2.2&r2=1.1.2.3&f=u



More information about the pld-cvs-commit mailing list