Author: mlschroe Date: Mon Dec 1 11:07:27 2008 New Revision: 11836 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11836&view=rev Log: - fix file dependency parsing Modified: trunk/sat-solver/tools/repo_susetags.c Modified: trunk/sat-solver/tools/repo_susetags.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_susetags.c?rev=11836&r1=11835&r2=11836&view=diff ============================================================================== --- trunk/sat-solver/tools/repo_susetags.c (original) +++ trunk/sat-solver/tools/repo_susetags.c Mon Dec 1 11:07:27 2008 @@ -66,15 +66,14 @@ Id id, evrid; char *sp[4]; - if (*line=='/') + if (line[6] == '/') { - /* Allow spaces in file dependencies. Autobuild may generate - such filedeps into the provides list. */ - id = str2id(pool, line, 1); + /* A file dependency. Do not try to parse it */ + id = str2id(pool, line + 6, 1); } else { - i = split(line + 5, sp, 4); /* name, <op>, evr, ? */ + i = split(line + 6, sp, 4); /* name, <op>, evr, ? */ if (i != 1 && i != 3) /* expect either 'name' or 'name' <op> 'evr' */ { pool_debug(pool, SAT_FATAL, "susetags: bad dependency line: %d: %s\n", pd->lineno, line); @@ -549,7 +548,7 @@ continue; if (! (line[0] && line[1] && line[2] && line[3] && (line[4] == ':' || line[4] == '.'))) continue; - if ( line[4] == '.') + if (line[4] == '.') { char *endlang; endlang = strchr(line + 5, ':'); -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org