From 13127796e4361ad8c74701736692b4ef159ec317 Mon Sep 17 00:00:00 2001 From: Michael Schroeder Date: Thu, 8 Nov 2007 11:37:00 +0000 Subject: [PATCH] - add a license - don't branch for supplemented packages - fix off by one in minimize queue revert code --- LICENSE.BSD | 28 ++++++++++++ src/bitmap.c | 7 +++ src/bitmap.h | 7 +++ src/evr.c | 7 +++ src/evr.h | 7 +++ src/hash.h | 7 +++ src/policy.c | 7 +++ src/policy.h | 7 +++ src/pool.c | 7 +++ src/pool.h | 7 +++ src/poolarch.c | 7 +++ src/poolarch.h | 7 +++ src/poolid.c | 7 +++ src/poolid.h | 7 +++ src/poolid_private.h | 7 +++ src/pooltypes.h | 7 +++ src/poolvendor.c | 7 +++ src/poolvendor.h | 7 +++ src/queue.c | 7 +++ src/queue.h | 7 +++ src/repo.c | 7 +++ src/repo.h | 7 +++ src/repo_solv.c | 7 +++ src/repo_solv.h | 7 +++ src/solvable.h | 7 +++ src/solver.c | 104 ++++++++++++++++++++++-------------------- src/solver.h | 7 +++ src/util.c | 7 +++ src/util.h | 7 +++ tools/attr_store.c | 7 +++ tools/attr_store.h | 7 +++ tools/attr_store_p.h | 7 +++ tools/content2solv.c | 7 +++ tools/dumpattr.c | 7 +++ tools/dumpsolv.c | 7 +++ tools/fastlz.c | 1 + tools/helix2solv.c | 7 +++ tools/mergesolv.c | 7 +++ tools/patchxml2solv.c | 7 +++ tools/repo_content.c | 7 +++ tools/repo_content.h | 7 +++ tools/repo_helix.c | 8 +++- tools/repo_helix.h | 7 +++ tools/repo_patchxml.c | 7 +++ tools/repo_patchxml.h | 7 +++ tools/repo_rpmdb.c | 7 +++ tools/repo_rpmdb.h | 7 +++ tools/repo_rpmmd.c | 7 +++ tools/repo_rpmmd.h | 7 +++ tools/repo_susetags.c | 7 +++ tools/repo_susetags.h | 7 +++ tools/repo_write.c | 7 +++ tools/repo_write.h | 7 +++ tools/rpmdb2solv.c | 7 +++ tools/rpmmd2solv.c | 7 +++ tools/susetags2solv.c | 7 +++ 56 files changed, 454 insertions(+), 51 deletions(-) create mode 100644 LICENSE.BSD diff --git a/LICENSE.BSD b/LICENSE.BSD new file mode 100644 index 0000000..79c9f2d --- /dev/null +++ b/LICENSE.BSD @@ -0,0 +1,28 @@ + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + +3. Neither the name of Novell nor the names of its contributors may + be used to endorse or promote products derived from this software + without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, +STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING +IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. + diff --git a/src/bitmap.c b/src/bitmap.c index 6873ce1..1f8a74d 100644 --- a/src/bitmap.c +++ b/src/bitmap.c @@ -1,3 +1,10 @@ +/* + * Copyright (c) 2007, Novell Inc. + * + * This program is licensed under the BSD license, read LICENSE.BSD + * for further information + */ + /* * bitmap.c * diff --git a/src/bitmap.h b/src/bitmap.h index efe5f3b..2c4028e 100644 --- a/src/bitmap.h +++ b/src/bitmap.h @@ -1,3 +1,10 @@ +/* + * Copyright (c) 2007, Novell Inc. + * + * This program is licensed under the BSD license, read LICENSE.BSD + * for further information + */ + /* * bitmap.h * diff --git a/src/evr.c b/src/evr.c index ab2d8a5..46698bf 100644 --- a/src/evr.c +++ b/src/evr.c @@ -1,3 +1,10 @@ +/* + * Copyright (c) 2007, Novell Inc. + * + * This program is licensed under the BSD license, read LICENSE.BSD + * for further information + */ + /* * evr.c * diff --git a/src/evr.h b/src/evr.h index d260eef..48227fd 100644 --- a/src/evr.h +++ b/src/evr.h @@ -1,3 +1,10 @@ +/* + * Copyright (c) 2007, Novell Inc. + * + * This program is licensed under the BSD license, read LICENSE.BSD + * for further information + */ + /* * evr.h * diff --git a/src/hash.h b/src/hash.h index f2534e9..6e1c4de 100644 --- a/src/hash.h +++ b/src/hash.h @@ -1,3 +1,10 @@ +/* + * Copyright (c) 2007, Novell Inc. + * + * This program is licensed under the BSD license, read LICENSE.BSD + * for further information + */ + /* * hash.h * generic hash functions diff --git a/src/policy.c b/src/policy.c index 0825c05..39e8499 100644 --- a/src/policy.c +++ b/src/policy.c @@ -1,3 +1,10 @@ +/* + * Copyright (c) 2007, Novell Inc. + * + * This program is licensed under the BSD license, read LICENSE.BSD + * for further information + */ + /* * Generic policy interface for SAT solver * diff --git a/src/policy.h b/src/policy.h index a00df94..4d76be6 100644 --- a/src/policy.h +++ b/src/policy.h @@ -1,3 +1,10 @@ +/* + * Copyright (c) 2007, Novell Inc. + * + * This program is licensed under the BSD license, read LICENSE.BSD + * for further information + */ + /* * Generic policy interface for SAT solver * diff --git a/src/pool.c b/src/pool.c index 493d8ef..cb4c0a9 100644 --- a/src/pool.c +++ b/src/pool.c @@ -1,3 +1,10 @@ +/* + * Copyright (c) 2007, Novell Inc. + * + * This program is licensed under the BSD license, read LICENSE.BSD + * for further information + */ + /* * pool.c * diff --git a/src/pool.h b/src/pool.h index 5e11eb0..f17ff84 100644 --- a/src/pool.h +++ b/src/pool.h @@ -1,3 +1,10 @@ +/* + * Copyright (c) 2007, Novell Inc. + * + * This program is licensed under the BSD license, read LICENSE.BSD + * for further information + */ + /* * pool.h * diff --git a/src/poolarch.c b/src/poolarch.c index 1f19466..5755fda 100644 --- a/src/poolarch.c +++ b/src/poolarch.c @@ -1,3 +1,10 @@ +/* + * Copyright (c) 2007, Novell Inc. + * + * This program is licensed under the BSD license, read LICENSE.BSD + * for further information + */ + /* * poolarch.c * diff --git a/src/poolarch.h b/src/poolarch.h index cd4f044..017f1e6 100644 --- a/src/poolarch.h +++ b/src/poolarch.h @@ -1,3 +1,10 @@ +/* + * Copyright (c) 2007, Novell Inc. + * + * This program is licensed under the BSD license, read LICENSE.BSD + * for further information + */ + #ifndef POOLARCH_H #define POOLARCH_H diff --git a/src/poolid.c b/src/poolid.c index 620bb6b..bc49bba 100644 --- a/src/poolid.c +++ b/src/poolid.c @@ -1,3 +1,10 @@ +/* + * Copyright (c) 2007, Novell Inc. + * + * This program is licensed under the BSD license, read LICENSE.BSD + * for further information + */ + /* * poolid.c * diff --git a/src/poolid.h b/src/poolid.h index 406e23d..069ecb5 100644 --- a/src/poolid.h +++ b/src/poolid.h @@ -1,3 +1,10 @@ +/* + * Copyright (c) 2007, Novell Inc. + * + * This program is licensed under the BSD license, read LICENSE.BSD + * for further information + */ + /* * poolid.h * diff --git a/src/poolid_private.h b/src/poolid_private.h index c2e4807..e293dbb 100644 --- a/src/poolid_private.h +++ b/src/poolid_private.h @@ -1,3 +1,10 @@ +/* + * Copyright (c) 2007, Novell Inc. + * + * This program is licensed under the BSD license, read LICENSE.BSD + * for further information + */ + /* * poolid_private.h * diff --git a/src/pooltypes.h b/src/pooltypes.h index 3231b07..6117c29 100644 --- a/src/pooltypes.h +++ b/src/pooltypes.h @@ -1,3 +1,10 @@ +/* + * Copyright (c) 2007, Novell Inc. + * + * This program is licensed under the BSD license, read LICENSE.BSD + * for further information + */ + /* * pooltypes.h * diff --git a/src/poolvendor.c b/src/poolvendor.c index b818445..97fac9f 100644 --- a/src/poolvendor.c +++ b/src/poolvendor.c @@ -1,3 +1,10 @@ +/* + * Copyright (c) 2007, Novell Inc. + * + * This program is licensed under the BSD license, read LICENSE.BSD + * for further information + */ + #include #include #include diff --git a/src/poolvendor.h b/src/poolvendor.h index 2596a43..6f0af69 100644 --- a/src/poolvendor.h +++ b/src/poolvendor.h @@ -1,3 +1,10 @@ +/* + * Copyright (c) 2007, Novell Inc. + * + * This program is licensed under the BSD license, read LICENSE.BSD + * for further information + */ + #ifndef POOLVENDOR_H #define POOLVENDOR_H diff --git a/src/queue.c b/src/queue.c index 8ab4db0..a585c1c 100644 --- a/src/queue.c +++ b/src/queue.c @@ -1,3 +1,10 @@ +/* + * Copyright (c) 2007, Novell Inc. + * + * This program is licensed under the BSD license, read LICENSE.BSD + * for further information + */ + /* * queue.c * diff --git a/src/queue.h b/src/queue.h index 9e9ee74..7066820 100644 --- a/src/queue.h +++ b/src/queue.h @@ -1,3 +1,10 @@ +/* + * Copyright (c) 2007, Novell Inc. + * + * This program is licensed under the BSD license, read LICENSE.BSD + * for further information + */ + /* * queue.h * diff --git a/src/repo.c b/src/repo.c index 90d016a..e212dad 100644 --- a/src/repo.c +++ b/src/repo.c @@ -1,3 +1,10 @@ +/* + * Copyright (c) 2007, Novell Inc. + * + * This program is licensed under the BSD license, read LICENSE.BSD + * for further information + */ + /* * repo.c * diff --git a/src/repo.h b/src/repo.h index cf825b8..1fa4f7b 100644 --- a/src/repo.h +++ b/src/repo.h @@ -1,3 +1,10 @@ +/* + * Copyright (c) 2007, Novell Inc. + * + * This program is licensed under the BSD license, read LICENSE.BSD + * for further information + */ + /* * repo.h * diff --git a/src/repo_solv.c b/src/repo_solv.c index b0555c4..3f75f50 100644 --- a/src/repo_solv.c +++ b/src/repo_solv.c @@ -1,3 +1,10 @@ +/* + * Copyright (c) 2007, Novell Inc. + * + * This program is licensed under the BSD license, read LICENSE.BSD + * for further information + */ + /* * repo_solv.c * diff --git a/src/repo_solv.h b/src/repo_solv.h index 1c54716..da76a3b 100644 --- a/src/repo_solv.h +++ b/src/repo_solv.h @@ -1,3 +1,10 @@ +/* + * Copyright (c) 2007, Novell Inc. + * + * This program is licensed under the BSD license, read LICENSE.BSD + * for further information + */ + /* * repo_solv.h * diff --git a/src/solvable.h b/src/solvable.h index b9b15f7..f1e3c0a 100644 --- a/src/solvable.h +++ b/src/solvable.h @@ -1,3 +1,10 @@ +/* + * Copyright (c) 2007, Novell Inc. + * + * This program is licensed under the BSD license, read LICENSE.BSD + * for further information + */ + /* * solvable.h * diff --git a/src/solver.c b/src/solver.c index cba80d5..9f38fd9 100644 --- a/src/solver.c +++ b/src/solver.c @@ -1,3 +1,10 @@ +/* + * Copyright (c) 2007, Novell Inc. + * + * This program is licensed under the BSD license, read LICENSE.BSD + * for further information + */ + /* * solver.c * @@ -172,6 +179,33 @@ dep_possible(Solver *solv, Id dep, Map *m) return 0; } +static inline int +is_supplemented(Solver *solv, Solvable *s) +{ + Id sup, *supp; + if (!s->supplements && !s->freshens) + return 0; + if (s->supplements) + { + supp = s->repo->idarraydata + s->supplements; + while ((sup = *supp++) != 0) + if (dep_fulfilled(solv, sup)) + break; + if (!sup) + return 0; + } + if (s->freshens) + { + supp = s->repo->idarraydata + s->freshens; + while ((sup = *supp++) != 0) + if (dep_fulfilled(solv, sup)) + break; + if (!sup) + return 0; + } + return 1; +} + static void prune_to_highest_prio(Pool *pool, Queue *plist) { @@ -207,7 +241,7 @@ prune_to_recommended(Solver *solv, Queue *plist) Pool *pool = solv->pool; int i, j; Solvable *s; - Id p, *pp, sup, *supp, rec, *recp, sug, *sugp, enh, *enhp; + Id p, *pp, rec, *recp, sug, *sugp, enh, *enhp; if (solv->recommends_index < 0) { @@ -245,28 +279,8 @@ prune_to_recommended(Solver *solv, Queue *plist) plist->elements[j++] = p; continue; } - s = pool->solvables + p; - if (!s->supplements && !s->freshens) - continue; - if (s->supplements) - { - supp = s->repo->idarraydata + s->supplements; - while ((sup = *supp++) != 0) - if (dep_fulfilled(solv, sup)) - break; - if (!sup) - continue; - } - if (s->freshens) - { - supp = s->repo->idarraydata + s->freshens; - while ((sup = *supp++) != 0) - if (dep_fulfilled(solv, sup)) - break; - if (!sup) - continue; - } - plist->elements[j++] = s - pool->solvables; + if (is_supplemented(solv, pool->solvables + p)) + plist->elements[j++] = p; } if (j) plist->count = j; @@ -1766,7 +1780,7 @@ revert(Solver *solv, int level) solv->decisionq_why.count--; solv->propagate_index = solv->decisionq.count; } - while (solv->minimize.count && solv->minimize.elements[solv->minimize.count - 1] < -level) + while (solv->minimize.count && solv->minimize.elements[solv->minimize.count - 1] <= -level) { solv->minimize.count--; while (solv->minimize.count && solv->minimize.elements[solv->minimize.count - 1] >= 0) @@ -1958,7 +1972,7 @@ run_solver(Solver *solv, int disablerules, int doweak) int systemlevel; int level, olevel; Rule *r; - int i, n; + int i, j, n; Solvable *s; Pool *pool = solv->pool; Id p, *dp; @@ -2174,14 +2188,22 @@ run_solver(Solver *solv, int disablerules, int doweak) prune_to_recommended(solv, &dq); if (dq.count > 1) prune_best_version_arch(pool, &dq); + j = 0; if (dq.count > 1) { - int j; - for (j = 1; j < dq.count; j++) - queue_push(&solv->minimize, dq.elements[j]); - queue_push(&solv->minimize, -level); + /* choose the supplemented one */ + for (j = 0; j < dq.count; j++) + if (is_supplemented(solv, pool->solvables + dq.elements[j])) + break; + if (j == dq.count) + { + for (j = 1; j < dq.count; j++) + queue_push(&solv->minimize, dq.elements[j]); + queue_push(&solv->minimize, -level); + j = 0; + } } - p = dq.elements[0]; + p = dq.elements[j]; s = pool->solvables + p; #if 0 printf("installing %s-%s.%s\n", id2str(pool, s->name), id2str(pool, s->evr), id2str(pool, s->arch)); @@ -2241,31 +2263,13 @@ run_solver(Solver *solv, int disablerules, int doweak) } else { - Id *supp, sup; s = pool->solvables + i; if (!s->supplements && !s->freshens) continue; if (!pool_installable(pool, s)) continue; - if (s->supplements) - { - supp = s->repo->idarraydata + s->supplements; - while ((sup = *supp++) != 0) - if (dep_fulfilled(solv, sup)) - break; - if (!sup) - continue; - } - if (s->freshens) - { - supp = s->repo->idarraydata + s->freshens; - while ((sup = *supp++) != 0) - if (dep_fulfilled(solv, sup)) - break; - if (!sup) - continue; - } - queue_pushunique(&dq, i); + if (is_supplemented(solv, s)) + queue_pushunique(&dq, i); } } if (dq.count) diff --git a/src/solver.h b/src/solver.h index bb6cbed..97e4fba 100644 --- a/src/solver.h +++ b/src/solver.h @@ -1,3 +1,10 @@ +/* + * Copyright (c) 2007, Novell Inc. + * + * This program is licensed under the BSD license, read LICENSE.BSD + * for further information + */ + /* * solver.h * diff --git a/src/util.c b/src/util.c index 4b95036..5d8f76c 100644 --- a/src/util.c +++ b/src/util.c @@ -1,3 +1,10 @@ +/* + * Copyright (c) 2007, Novell Inc. + * + * This program is licensed under the BSD license, read LICENSE.BSD + * for further information + */ + #include #include #include diff --git a/src/util.h b/src/util.h index 1b90cb3..6eb7809 100644 --- a/src/util.h +++ b/src/util.h @@ -1,3 +1,10 @@ +/* + * Copyright (c) 2007, Novell Inc. + * + * This program is licensed under the BSD license, read LICENSE.BSD + * for further information + */ + /* * util.h * diff --git a/tools/attr_store.c b/tools/attr_store.c index 4178ae2..ad59982 100644 --- a/tools/attr_store.c +++ b/tools/attr_store.c @@ -1,3 +1,10 @@ +/* + * Copyright (c) 2007, Novell Inc. + * + * This program is licensed under the BSD license, read LICENSE.BSD + * for further information + */ + #include #include #include diff --git a/tools/attr_store.h b/tools/attr_store.h index 0a2ba1b..c5b634a 100644 --- a/tools/attr_store.h +++ b/tools/attr_store.h @@ -1,3 +1,10 @@ +/* + * Copyright (c) 2007, Novell Inc. + * + * This program is licensed under the BSD license, read LICENSE.BSD + * for further information + */ + #ifndef ATTR_STORE_H #define ATTR_STORE_H diff --git a/tools/attr_store_p.h b/tools/attr_store_p.h index 5470657..bcad913 100644 --- a/tools/attr_store_p.h +++ b/tools/attr_store_p.h @@ -1,3 +1,10 @@ +/* + * Copyright (c) 2007, Novell Inc. + * + * This program is licensed under the BSD license, read LICENSE.BSD + * for further information + */ + #ifndef ATTR_STORE_P_H #define ATTR_STORE_P_H diff --git a/tools/content2solv.c b/tools/content2solv.c index fa2e8ec..c2362e0 100644 --- a/tools/content2solv.c +++ b/tools/content2solv.c @@ -1,3 +1,10 @@ +/* + * Copyright (c) 2007, Novell Inc. + * + * This program is licensed under the BSD license, read LICENSE.BSD + * for further information + */ + #include #include #include diff --git a/tools/dumpattr.c b/tools/dumpattr.c index ef355f8..acc2c4c 100644 --- a/tools/dumpattr.c +++ b/tools/dumpattr.c @@ -1,3 +1,10 @@ +/* + * Copyright (c) 2007, Novell Inc. + * + * This program is licensed under the BSD license, read LICENSE.BSD + * for further information + */ + #include #include #include diff --git a/tools/dumpsolv.c b/tools/dumpsolv.c index cde1971..2ff4f96 100644 --- a/tools/dumpsolv.c +++ b/tools/dumpsolv.c @@ -1,3 +1,10 @@ +/* + * Copyright (c) 2007, Novell Inc. + * + * This program is licensed under the BSD license, read LICENSE.BSD + * for further information + */ + #include #include #include diff --git a/tools/fastlz.c b/tools/fastlz.c index 1139405..360e5c4 100644 --- a/tools/fastlz.c +++ b/tools/fastlz.c @@ -1,3 +1,4 @@ + #include #include #include diff --git a/tools/helix2solv.c b/tools/helix2solv.c index f33ffcd..1d039e2 100644 --- a/tools/helix2solv.c +++ b/tools/helix2solv.c @@ -1,3 +1,10 @@ +/* + * Copyright (c) 2007, Novell Inc. + * + * This program is licensed under the BSD license, read LICENSE.BSD + * for further information + */ + /* * helix2solv.c * diff --git a/tools/mergesolv.c b/tools/mergesolv.c index 1127217..d51dafe 100644 --- a/tools/mergesolv.c +++ b/tools/mergesolv.c @@ -1,3 +1,10 @@ +/* + * Copyright (c) 2007, Novell Inc. + * + * This program is licensed under the BSD license, read LICENSE.BSD + * for further information + */ + /* * mergesolv * diff --git a/tools/patchxml2solv.c b/tools/patchxml2solv.c index a4ab527..e4a4e06 100644 --- a/tools/patchxml2solv.c +++ b/tools/patchxml2solv.c @@ -1,3 +1,10 @@ +/* + * Copyright (c) 2007, Novell Inc. + * + * This program is licensed under the BSD license, read LICENSE.BSD + * for further information + */ + #include #include #include diff --git a/tools/repo_content.c b/tools/repo_content.c index 2b1f71f..7ef0c27 100644 --- a/tools/repo_content.c +++ b/tools/repo_content.c @@ -1,3 +1,10 @@ +/* + * Copyright (c) 2007, Novell Inc. + * + * This program is licensed under the BSD license, read LICENSE.BSD + * for further information + */ + #include #include #include diff --git a/tools/repo_content.h b/tools/repo_content.h index 2ccf200..0f1e48d 100644 --- a/tools/repo_content.h +++ b/tools/repo_content.h @@ -1 +1,8 @@ +/* + * Copyright (c) 2007, Novell Inc. + * + * This program is licensed under the BSD license, read LICENSE.BSD + * for further information + */ + Repo * pool_addrepo_content(Pool *pool, FILE *fp); diff --git a/tools/repo_helix.c b/tools/repo_helix.c index b8c58de..79f9e0e 100644 --- a/tools/repo_helix.c +++ b/tools/repo_helix.c @@ -1,4 +1,10 @@ -/* -*- mode: C; c-file-style: "gnu"; fill-column: 78 -*- */ +/* + * Copyright (c) 2007, Novell Inc. + * + * This program is licensed under the BSD license, read LICENSE.BSD + * for further information + */ + /* * repo_helix.c * diff --git a/tools/repo_helix.h b/tools/repo_helix.h index b03a157..9260709 100644 --- a/tools/repo_helix.h +++ b/tools/repo_helix.h @@ -1,3 +1,10 @@ +/* + * Copyright (c) 2007, Novell Inc. + * + * This program is licensed under the BSD license, read LICENSE.BSD + * for further information + */ + /* * repo_helix.h * diff --git a/tools/repo_patchxml.c b/tools/repo_patchxml.c index d9c9820..a046f6e 100644 --- a/tools/repo_patchxml.c +++ b/tools/repo_patchxml.c @@ -1,3 +1,10 @@ +/* + * Copyright (c) 2007, Novell Inc. + * + * This program is licensed under the BSD license, read LICENSE.BSD + * for further information + */ + #include #include #include diff --git a/tools/repo_patchxml.h b/tools/repo_patchxml.h index 8f9dff5..6946305 100644 --- a/tools/repo_patchxml.h +++ b/tools/repo_patchxml.h @@ -1 +1,8 @@ +/* + * Copyright (c) 2007, Novell Inc. + * + * This program is licensed under the BSD license, read LICENSE.BSD + * for further information + */ + extern Repo *pool_addrepo_patchxml(Pool *pool, FILE *fp); diff --git a/tools/repo_rpmdb.c b/tools/repo_rpmdb.c index b08cd2b..e56b3f8 100644 --- a/tools/repo_rpmdb.c +++ b/tools/repo_rpmdb.c @@ -1,3 +1,10 @@ +/* + * Copyright (c) 2007, Novell Inc. + * + * This program is licensed under the BSD license, read LICENSE.BSD + * for further information + */ + /* * repo_rpmdb * diff --git a/tools/repo_rpmdb.h b/tools/repo_rpmdb.h index 027d610..e5b3b5c 100644 --- a/tools/repo_rpmdb.h +++ b/tools/repo_rpmdb.h @@ -1 +1,8 @@ +/* + * Copyright (c) 2007, Novell Inc. + * + * This program is licensed under the BSD license, read LICENSE.BSD + * for further information + */ + extern Repo *pool_addrepo_rpmdb(Pool *pool, Repo *ref); diff --git a/tools/repo_rpmmd.c b/tools/repo_rpmmd.c index 2aada6d..598d6bd 100644 --- a/tools/repo_rpmmd.c +++ b/tools/repo_rpmmd.c @@ -1,3 +1,10 @@ +/* + * Copyright (c) 2007, Novell Inc. + * + * This program is licensed under the BSD license, read LICENSE.BSD + * for further information + */ + #include #include #include diff --git a/tools/repo_rpmmd.h b/tools/repo_rpmmd.h index 3e51fa3..93a6e9e 100644 --- a/tools/repo_rpmmd.h +++ b/tools/repo_rpmmd.h @@ -1 +1,8 @@ +/* + * Copyright (c) 2007, Novell Inc. + * + * This program is licensed under the BSD license, read LICENSE.BSD + * for further information + */ + extern Repo *pool_addrepo_rpmmd(Pool *pool, FILE *fp); diff --git a/tools/repo_susetags.c b/tools/repo_susetags.c index 14a23e2..05cb9ee 100644 --- a/tools/repo_susetags.c +++ b/tools/repo_susetags.c @@ -1,3 +1,10 @@ +/* + * Copyright (c) 2007, Novell Inc. + * + * This program is licensed under the BSD license, read LICENSE.BSD + * for further information + */ + #include #include #include diff --git a/tools/repo_susetags.h b/tools/repo_susetags.h index 1731f65..ba7064f 100644 --- a/tools/repo_susetags.h +++ b/tools/repo_susetags.h @@ -1 +1,8 @@ +/* + * Copyright (c) 2007, Novell Inc. + * + * This program is licensed under the BSD license, read LICENSE.BSD + * for further information + */ + extern Repo *pool_addrepo_susetags(Pool *pool, FILE *fp, Id vendor, int with_attr); diff --git a/tools/repo_write.c b/tools/repo_write.c index 9104cc3..8171498 100644 --- a/tools/repo_write.c +++ b/tools/repo_write.c @@ -1,3 +1,10 @@ +/* + * Copyright (c) 2007, Novell Inc. + * + * This program is licensed under the BSD license, read LICENSE.BSD + * for further information + */ + /* * repo_write.c * diff --git a/tools/repo_write.h b/tools/repo_write.h index 7e73e27..db36bde 100644 --- a/tools/repo_write.h +++ b/tools/repo_write.h @@ -1,3 +1,10 @@ +/* + * Copyright (c) 2007, Novell Inc. + * + * This program is licensed under the BSD license, read LICENSE.BSD + * for further information + */ + /* * repo_write.h * diff --git a/tools/rpmdb2solv.c b/tools/rpmdb2solv.c index 3dd7f92..bf77332 100644 --- a/tools/rpmdb2solv.c +++ b/tools/rpmdb2solv.c @@ -1,3 +1,10 @@ +/* + * Copyright (c) 2007, Novell Inc. + * + * This program is licensed under the BSD license, read LICENSE.BSD + * for further information + */ + /* * rpmdb2solv * diff --git a/tools/rpmmd2solv.c b/tools/rpmmd2solv.c index 4a79752..becb3d2 100644 --- a/tools/rpmmd2solv.c +++ b/tools/rpmmd2solv.c @@ -1,3 +1,10 @@ +/* + * Copyright (c) 2007, Novell Inc. + * + * This program is licensed under the BSD license, read LICENSE.BSD + * for further information + */ + #include #include #include diff --git a/tools/susetags2solv.c b/tools/susetags2solv.c index 91f73a8..6982fce 100644 --- a/tools/susetags2solv.c +++ b/tools/susetags2solv.c @@ -1,3 +1,10 @@ +/* + * Copyright (c) 2007, Novell Inc. + * + * This program is licensed under the BSD license, read LICENSE.BSD + * for further information + */ + #include #include #include -- 2.34.1