int intag = 0;
int intag_linestart = 0;
int cummulate = 0;
- int indesc = 0;
+ int notfound = 0;
int indelta = 0;
int last_found_pack = 0;
Id first_new_pkg = 0;
if ((flags & (SUSETAGS_EXTEND|REPO_EXTEND_SOLVABLES)) != 0 && repo->nrepodata)
{
joinhash = joinhash_init(repo, &joinhashm);
- indesc = 1;
}
data = repo_add_repodata(repo, flags);
finish_solvable(&pd, s, freshens);
s = 0;
handle = 0;
- freshens = 0;
+ freshens = 0;
indelta = 0;
+ notfound = 0;
last_found_pack = 0;
- indesc++;
if (createdpkgs)
{
solv_free(joinhash);
finish_solvable(&pd, s, freshens);
s = 0;
handle = 0;
- freshens = 0;
+ freshens = 0;
indelta = 0;
+ notfound = 0;
/* define kind */
pd.kind = 0;
}
/* do not create new packages in EXTEND_SOLVABLES mode */
if (!s && (flags & REPO_EXTEND_SOLVABLES) != 0)
- continue;
+ {
+ notfound = 1;
+ continue;
+ }
/* fallthrough to package creation */
}
if (!s)
/* we need a solvable for all other tags */
if (!s)
{
- if (indesc >= 2)
- {
- /* Probably invalid input data in the second set of solvables. Ignore */
- continue;
- }
+ if (notfound)
+ continue; /* did not find the solvable to extend */
#if 0
pool_debug(pool, SOLV_WARN, "susetags: stray line: %d: %s\n", pd.lineno, line);
#endif