Attachment #1151 for bug #8089

View | Details | Raw Unified | Return to bug 8089
Collapse All | Expand All




		continue;
	}
	
	if (me == NULL) {	/* bail on unknown %... */
#ifndef HACK
#if DEAD
		/* XXX hack to skip over empty arg list */
		if (fn == 1 && *f == '*') {
			s = se;
			continue;
		}
#endif
		/* XXX hack to permit non-overloaded %foo to be passed */
		c = '%';	/* XXX only need to save % */
		SAVECHAR(mb, c);
#else
		rpmError(RPMERR_BADSPEC,
			_("Macro %%%.*s not found\n"), fn, f);
		rc = 1;
#endif
		continue;
	}


Return to bug 8089

Lines 1435-1457 expandMacro(MacroBuf mb) Link Here

(-)rpm-4_0-4.0.4-orig/rpmio/macro.c (-16 / +3 lines)
1435	continue;	1435	continue;
1436	}	1436	}
1437		1437
1438	if (me == NULL) { /* leave unknown %... as is */	1438	if (me == NULL) { /* bail on unknown %... */
1439	#ifndef HACK
1440	#if DEAD
1441	/* XXX hack to skip over empty arg list */
1442	if (fn == 1 && f == '') {
1443	s = se;
1444	continue;
1445	}
1446	#endif
1447	/* XXX hack to permit non-overloaded %foo to be passed */
1448	c = '%'; /* XXX only need to save % */
1449	SAVECHAR(mb, c);
1450	#else
1451	rpmError(RPMERR_BADSPEC,	1439	rpmError(RPMERR_BADSPEC,
1452	_("Macro %%%.*s not found, skipping\n"), fn, f);	1440	_("Macro %%%.*s not found\n"), fn, f);
1453	s = se;	1441	rc = 1;
1454	#endif
1455	continue;	1442	continue;
1456	}	1443	}
1457		1444