Attachment 366 Details for Bug 3883 – Include dependency token into reported error message

[patch] Include dependency token into reported error message

rpm-4_0-4.0.4-extended-error-messages.patch (text/plain), 1.14 KB, created by Alexander Bokovoy on 2004-03-25 18:40:37 MSK

(hide)

Description:

Filename:

MIME Type:

Creator: Alexander Bokovoy

Created: 2004-03-25 18:40:37 MSK

Size: 1.14 KB

patch

obsolete

>--- rpm-4_0-4.0.4/build/parseReqs.c.error_orig	2004-01-27 12:56:42 +0200
>+++ rpm-4_0-4.0.4/build/parseReqs.c	2004-03-25 17:34:07 +0200
>@@ -127,8 +127,9 @@
> 	/* Names must not contain '%<=>' symbols - it's common error */
> 	if (strpbrk (req, "%<=>")) {
> 	    rpmError(RPMERR_BADSPEC,
>-		     _("line %d: Dependency tokens must not contain '%%<=>' symbols: %s\n"),
>-		     spec->lineNum, spec->line);
>+		     _("line %d: Dependency tokens must not contain '%%<=>' symbols: %s\n"
>+		       "\tRequires token (possibly autogenerated): %s\n"),
>+		     spec->lineNum, spec->line, req);
> 	    return RPMERR_BADSPEC;
> 	}
> 
>@@ -195,8 +196,9 @@
> 	/* Versions must not contain '%<=>' symbols - it's common error */
> 	if (version && strpbrk (version, "%<=>")) {
> 	    rpmError(RPMERR_BADSPEC,
>-		     _("line %d: Dependency tokens must not contain '%%<=>' symbols: %s\n"),
>-		     spec->lineNum, spec->line);
>+		     _("line %d: Dependency tokens must not contain '%%<=>' symbols: %s\n"
>+		       "\tVersion component (possibly autogenerated): %s\n"),
>+		     spec->lineNum, spec->line, version);
> 	    req = _free(req);
> 	    version = _free(version);
> 	    return RPMERR_BADSPEC;

Actions: View | Diff

Attachments on bug 3883: 366 | 398