aboutsummaryrefslogtreecommitdiffstats
path: root/gendepslist2.cc
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-07-27 18:01:30 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-07-27 18:01:30 +0000
commit2157f729ad44c194cbd2c6d1f1bfa9e21867d095 (patch)
tree13482e3101d3afcc6a40ce74c7970888c9c8138a /gendepslist2.cc
parent00bc2a981e50b570006eecc65495c0ef8282f370 (diff)
downloadrpmtools-2157f729ad44c194cbd2c6d1f1bfa9e21867d095.tar
rpmtools-2157f729ad44c194cbd2c6d1f1bfa9e21867d095.tar.gz
rpmtools-2157f729ad44c194cbd2c6d1f1bfa9e21867d095.tar.bz2
rpmtools-2157f729ad44c194cbd2c6d1f1bfa9e21867d095.tar.xz
rpmtools-2157f729ad44c194cbd2c6d1f1bfa9e21867d095.zip
no_comment
Diffstat (limited to 'gendepslist2.cc')
-rw-r--r--gendepslist2.cc9
1 files changed, 2 insertions, 7 deletions
diff --git a/gendepslist2.cc b/gendepslist2.cc
index f132dd2..9207e0e 100644
--- a/gendepslist2.cc
+++ b/gendepslist2.cc
@@ -260,7 +260,7 @@ map<string, set<string> > closure(const map<string, set<string> > &names) {
//};
inline int verif(int npack, int ndep, const string &package, const string &dep) {
- if (ndep > npack) cerr << package << " requires " << dep << " which is not in the same hdlist " << ndep << " > " << npack << "\n";
+ if (ndep > npack && !(ndep == 0 && npack == -1)) cerr << package << " requires " << dep << " which is not in the same hdlist " << ndep << " > " << npack << "\n";
return ndep;
}
@@ -298,19 +298,14 @@ void printDepslist(ofstream *out1, ofstream *out2) {
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) {
list.erase(*p);
- vector<string> l = split('|', *p);
- for (ITv k = l.begin(); k != l.end(); k++) {
- list.insert(*k);
- add(list, names[*k]);
- }
}
}
for (ITs p = list.begin(); p != list.end(); p++) {
hdlist2names[0].erase(*p);
- if (p->find('|') != string::npos) list.erase(*p);
}
} else {
list = hdlist2names[i];