diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2000-03-24 14:29:15 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2000-03-24 14:29:15 +0000 |
| commit | 47db3aa73d8c6b114940768738761d9bfba31f54 (patch) | |
| tree | b0162e01df90461631f5acfcacb647be2ea71037 /gendepslist2.cc | |
| parent | ddd32559719b13d4917dc85f0f5fe906a914e48d (diff) | |
| download | rpmtools-47db3aa73d8c6b114940768738761d9bfba31f54.tar rpmtools-47db3aa73d8c6b114940768738761d9bfba31f54.tar.gz rpmtools-47db3aa73d8c6b114940768738761d9bfba31f54.tar.bz2 rpmtools-47db3aa73d8c6b114940768738761d9bfba31f54.tar.xz rpmtools-47db3aa73d8c6b114940768738761d9bfba31f54.zip | |
no_comment
Diffstat (limited to 'gendepslist2.cc')
| -rw-r--r-- | gendepslist2.cc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/gendepslist2.cc b/gendepslist2.cc index 57a421f..dc5d840 100644 --- a/gendepslist2.cc +++ b/gendepslist2.cc @@ -287,10 +287,12 @@ void printDepslist(ofstream *out1, ofstream *out2) { set<string> list; if (i == -1) { - list = names[name2fullname["basesystem"]]; + list.insert(name2fullname["filesystem"]); nb_deps_done[name2fullname["filesystem"]] = 10; + list.insert(name2fullname["setup"]); nb_deps_done[name2fullname["setup"]] = 10; + add(list, names[name2fullname["basesystem"]]); list.insert(name2fullname["basesystem"]); for (ITs p = list.begin(); p != list.end(); p++) { - if (p->find('|') != string::npos) { + if (p->find('|') != string::npos) { list.erase(*p); vector<string> l = split('|', *p); for (ITv k = l.begin(); k != l.end(); k++) { @@ -307,6 +309,10 @@ void printDepslist(ofstream *out1, ofstream *out2) { int l_best = 9999; for (ITs p = list.begin(); p != list.end(); p++) { + if (p->compare("NOTFOUND_") > 1) { + list.erase(*p); + continue; + } int lo = names[*p].size() - nb_deps_done[*p]; if (lo < l_best) { l_best = lo; |