From 2dfbf4ce2700f3495da852547d373aed35390bcb Mon Sep 17 00:00:00 2001 From: Michael Schroeder Date: Fri, 22 Jun 2012 18:51:52 +0200 Subject: [PATCH] - set disttype before setting the architecture so that the noarch id is correct --- ext/testcase.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ext/testcase.c b/ext/testcase.c index 378f3d01..9d161fea 100644 --- a/ext/testcase.c +++ b/ext/testcase.c @@ -1848,10 +1848,7 @@ testcase_read(Pool *pool, FILE *fp, char *testcase, Queue *job, char **resultp, { int i; prepared = 0; - if (strcmp(pieces[1], "unset") != 0) - pool_setarch(pool, pieces[1]); - else - pool_setarch(pool, 0); + /* must set the disttype before the arch */ for (i = 0; disttype2str[i].str != 0; i++) if (!strcmp(disttype2str[i].str, pieces[2])) break; @@ -1865,6 +1862,10 @@ testcase_read(Pool *pool, FILE *fp, char *testcase, Queue *job, char **resultp, pool_debug(pool, SOLV_ERROR, "testcase_read: system: cannot change disttype to '%s'\n", pieces[2]); #endif } + if (strcmp(pieces[1], "unset") != 0) + pool_setarch(pool, pieces[1]); + else + pool_setarch(pool, 0); if (npieces > 3) { Repo *repo = testcase_str2repo(pool, pieces[3]); -- 2.47.2