diff options
| -rw-r--r-- | gendepslist2.cc | 10 | ||||
| -rw-r--r-- | genhdlist_cz2 | 2 | ||||
| -rw-r--r-- | rpmtools.spec | 8 |
3 files changed, 16 insertions, 4 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; diff --git a/genhdlist_cz2 b/genhdlist_cz2 index 26791d0..ec83e54 100644 --- a/genhdlist_cz2 +++ b/genhdlist_cz2 @@ -41,7 +41,7 @@ while ($_ = readdir DIR) { my ($key) = /(.*)\..*\.rpm$/ or next; system("rpm2header $dir/$_ > $key") unless -e $key; $? == 0 or unlink($key), die "bad rpm $dir/$_\n"; - -z $key or unlink($key), die "bad rpm $dir/$_\n"; + -s $key or unlink($key), die "bad rpm $dir/$_\n"; $keys{$key} = 1; } if (-e $depslist) { diff --git a/rpmtools.spec b/rpmtools.spec index 703f342..9f63384 100644 --- a/rpmtools.spec +++ b/rpmtools.spec @@ -1,5 +1,5 @@ %define name rpmtools -%define release 8mdk +%define release 10mdk # do not modify here, see Makefile in the CVS %define version 1.1 @@ -56,6 +56,12 @@ rm -rf $RPM_BUILD_ROOT /usr/bin/genhdlists %changelog +* Fri Mar 24 2000 Pixel <pixel@mandrakesoft.com> 1.1-10mdk +- gendepslist2 bug fix again + +* Thu Mar 23 2000 Pixel <pixel@mandrakesoft.com> 1.1-9mdk +- gendepslist2 now put filesystem and setup first + * Thu Mar 23 2000 Pixel <pixel@mandrakesoft.com> 1.1-8mdk - gendepslist2 now handles virtual basesystem requires |