- add a license

- don't branch for supplemented packages
- fix off by one in minimize queue revert code

diff --git a/LICENSE.BSD b/LICENSE.BSD
new file mode 100644 (file)
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 6873ce16db9bddcc6c535e64b863e7ce3db22a79..1f8a74d61a042d2a5e5d25e5417158214e5e6633 100644 (file)
--- 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 efe5f3bbe7337e1fd264d7cb8cfd107e1b9e4304..2c4028e806db8b660a44cee79ce9af47a6759203 100644 (file)
--- 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 ab2d8a5464e4328d422f838ef97bd6ed79c4894f..46698bf6f4699cd900331680939108a504ca1c76 100644 (file)
--- 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 d260eef6af0225d6404fc68eab7594af1224c20f..48227fd18bcdf7a8d86a63a0926267275f9e5972 100644 (file)
--- 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 f2534e95d9853ab30a88d36df25782882d63f5d2..6e1c4dee4320c36bdf8716278549305983be2827 100644 (file)
--- 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 0825c050c43d53784b0318d9e4f42dd46261f392..39e8499bc8eb74b708a314535ea5f2c4d340ee5c 100644 (file)
--- 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 a00df94f592c78b88b51048d110a61cb4c2fe515..4d76be6772af34abf3d50f57ef41b31cd56f29f2 100644 (file)
--- 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 493d8ef69d2569309d932484ed95de440f8cb074..cb4c0a92ded7b927aa57be673730cebbedab402e 100644 (file)
--- 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 5e11eb04bf9f618aee56be2fa624a4ececdabce1..f17ff8412d7949035f8042b06b4d1c3725426efd 100644 (file)
--- 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 1f19466ee74ddfc7770ce3c9b5d7929e6f7562b3..5755fdadb5230f679f7ef3935739085df298f4e4 100644 (file)
--- 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 cd4f04421d37cee6a64a6a4dbcf8f3f5336ec126..017f1e62a44654ab86751ce6d55b9c7995a394e3 100644 (file)
--- 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 620bb6be9696430c85f1bb244a3b25d1ede2d62c..bc49bba4ab23f192db5469e17d7e2d4f8da37d27 100644 (file)
--- 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 406e23dbe528645fa449c06b0c490c03b2509c2d..069ecb5cd092f45d0b8b760b9f68d2f6744cecaf 100644 (file)
--- 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 c2e4807c2420442f9981426db508187e21bbcd04..e293dbbf6aa35ca8e18da14aa52c9c7d87b50d55 100644 (file)
--- 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 3231b07e04c6cd4bc076c99941a5f0ce55cae763..6117c29ca4d333e7b1b83850202c5ce93081059b 100644 (file)
--- 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 b818445385f66c00d30b31c6ab12e6fbe1ccf255..97fac9f8fa4f000ae2a91ed8b46157373b14b02b 100644 (file)
--- 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 <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/src/poolvendor.h b/src/poolvendor.h
index 2596a43b3a7d4308693a823c11dcbbcb3020787c..6f0af692fa26b6a52e27a476398ad540a508267b 100644 (file)
--- 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 8ab4db09a93a0ffb09cf73522f345ec18eeedadb..a585c1c8622f3b6c97d9fa28b74cefa7a5707b03 100644 (file)
--- 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 9e9ee742601bf82b4546daf12f74ae866714682b..7066820b377a2be2f14c4d5229d3e507e1d5b182 100644 (file)
--- 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 90d016a2318ff6e3e792d6722231f8387e67bd68..e212dad88f77cf3625c4abfa64ccfcfbf4b91c5b 100644 (file)
--- 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 cf825b8cf5d53ee698d26c8957f2b7f8e2626678..1fa4f7b32865d856254b80d89ba47ef6c37645b3 100644 (file)
--- 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 b0555c4caa1c41eee09cf79e5ac0e1de8ea22639..3f75f50ecc951f5de268352c31d44207be08cd41 100644 (file)
--- 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 1c547163d7791a11ab269da6f9515e68a989df7a..da76a3bb487549dfbc82230d94ab4fcc1a1f883f 100644 (file)
--- 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 b9b15f7a7355e6fe26e05014511c7f063c30c966..f1e3c0aee36ed3f823ff4c01848f43fde099349a 100644 (file)
--- 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 cba80d511b66a434cffd8e7b95d0ea9ea868bb5c..9f38fd9aedbf0b25cdb207e09ad69746814027fa 100644 (file)
--- 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 bb6cbed8e1ab0b30d3a98827401123d49a5fe748..97e4fba170b42d3580ad39813cd3677a1be626a3 100644 (file)
--- 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 4b95036342b2143e7724407b2925f365c5aaba06..5d8f76cdfff218effa4666e5085932f7e8d1ea4b 100644 (file)
--- 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 <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>

diff --git a/src/util.h b/src/util.h
index 1b90cb34a332ebcb672db5fab53794ebdc07f932..6eb7809881b842d428240bd47d031f99a08803e5 100644 (file)
--- 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 4178ae2f8010a7bf11260ae554ccb9a104bdf41c..ad59982c367d26dadc540c0ae9e08dffc2c41c05 100644 (file)
--- 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 <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>

diff --git a/tools/attr_store.h b/tools/attr_store.h
index 0a2ba1b85eb830f0d22209316c71ff6668e9ea98..c5b634adb3b9fedae379348890c9d43615c6d8c0 100644 (file)
--- 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 54706579068ebc1c71c98739b57fc61d29332a08..bcad913d5747503c403d801a3994918100f30bf6 100644 (file)
--- 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 fa2e8ec3886a06a5fba7b609c8fa7aa50886bc23..c2362e0d7ffede4c884717b271222c77c7a6dee1 100644 (file)
--- 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 <sys/types.h>
 #include <limits.h>
 #include <fcntl.h>

diff --git a/tools/dumpattr.c b/tools/dumpattr.c
index ef355f858df8dd0c1ba642bf88250c90a1ea5ff4..acc2c4c1293fa9c7aad0903704898ec47d34e2ae 100644 (file)
--- 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 <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>

diff --git a/tools/dumpsolv.c b/tools/dumpsolv.c
index cde1971a6d82266a39e843d8ef9238014d35d7ca..2ff4f969d2836d7f3b17757fd0daf5f1a3a8a23b 100644 (file)
--- 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 <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>

diff --git a/tools/fastlz.c b/tools/fastlz.c
index 11394058b25b069168f2636a645045c6c07f1137..360e5c4f8a8796bda052c9c38ab1b936f3f539d3 100644 (file)
--- a/tools/fastlz.c
+++ b/tools/fastlz.c
@@ -1,3 +1,4 @@
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>

diff --git a/tools/helix2solv.c b/tools/helix2solv.c
index f33ffcddb70eea4b117a12f4d09e223c7f5a137f..1d039e234387f53e7478591061dfe7a98016d838 100644 (file)
--- 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 11272172958ffa2aa170b1480a02972a3ca6b42c..d51dafe22b90dce6464a4f5bca4abfa62828fbe9 100644 (file)
--- 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 a4ab5277bfc94693266342d8939342de072d1641..e4a4e0600e44d84e465d59674977c0f8a4ccef78 100644 (file)
--- 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 <sys/types.h>
 #include <limits.h>
 #include <fcntl.h>

diff --git a/tools/repo_content.c b/tools/repo_content.c
index 2b1f71f3dbbe505aefe5f68505bc905bae4610fa..7ef0c279cafe732d9465f9cf0c615c6fe8133b9d 100644 (file)
--- 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 <sys/types.h>
 #include <limits.h>
 #include <fcntl.h>

diff --git a/tools/repo_content.h b/tools/repo_content.h
index 2ccf20076bb231dbc5cfa882e9854c26ab0e097e..0f1e48d5aecb984d4901eab8e930c61d47fb1a96 100644 (file)
--- 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 b8c58de6532c7c624c23e60b4492948bd76037e9..79f9e0e2ab52c14814d34d684233a46ecc383504 100644 (file)
--- 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 b03a1579501e69527aac56b8663faba21e2f03bb..9260709a9d82281c424575c40cbfbde4df08c342 100644 (file)
--- 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 d9c98207d4f114827e5424f56b7d89d47396acc0..a046f6e508df4291ce260f630b8bbd0725d35e6e 100644 (file)
--- 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 <sys/types.h>
 #include <limits.h>
 #include <fcntl.h>

diff --git a/tools/repo_patchxml.h b/tools/repo_patchxml.h
index 8f9dff582f8d909c2bc38d98732e234213a0599c..6946305836ced73829bb5f78bc4b5a6e04f99c6b 100644 (file)
--- 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 b08cd2ba6ece3654b67614cc79c3c33747dd015a..e56b3f8f243a9c8a1ad8c409ffb951ec5322d1c4 100644 (file)
--- 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 027d610c02c01f6b1005e89b3ee053248c980ab0..e5b3b5c6cc806713323a1fe58d394107fd4e03ea 100644 (file)
--- 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 2aada6d81c669d4e6f50c0347920458a1b20092e..598d6bd0f69dd5f35d29edd6f9d0427b30ac638d 100644 (file)
--- 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 <sys/types.h>
 #include <limits.h>
 #include <fcntl.h>

diff --git a/tools/repo_rpmmd.h b/tools/repo_rpmmd.h
index 3e51fa324e6cb7c9c567a0b6e01e0e744dbfc5d9..93a6e9e7883d301a10da9287a07d758c142f94ed 100644 (file)
--- 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 14a23e2655dcbbb1b6a26c35f0d397dbc8a83dce..05cb9ee7ad93dc3577e427f88c21fa59b9ca5b0a 100644 (file)
--- 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 <sys/types.h>
 #include <limits.h>
 #include <fcntl.h>

diff --git a/tools/repo_susetags.h b/tools/repo_susetags.h
index 1731f6534d402144c385ac52804605ae84fe0bb6..ba7064f0953ed3c2708fb928f0f89ef5c3d1b927 100644 (file)
--- 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 9104cc37fdcd1dd45722c7f990f9e7aa13874fd4..81714986445a2b6994ec1a4db47c3a1534fb0558 100644 (file)
--- 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 7e73e27207bedf6f32e7b5b5a868138fb391f2e5..db36bde7986a31bbc2be800f51372aaa5460bab1 100644 (file)
--- 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 3dd7f926a8c598dc073db7b4f668cc2b76c976d5..bf77332c3e3ce7f2924065effacf6076b7bda7d5 100644 (file)
--- 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 4a797527414be01e166b5900b2dc1808a0f2a47c..becb3d2361a7c7ca32d7182480993c58026837e4 100644 (file)
--- 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 <sys/types.h>
 #include <limits.h>
 #include <fcntl.h>

diff --git a/tools/susetags2solv.c b/tools/susetags2solv.c
index 91f73a8c2317cbe417ff4b4d2824c6813c98ba7b..6982fcefd49928651d63c54fcccc2a3e825fa1ef 100644 (file)
--- 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 <sys/types.h>
 #include <limits.h>
 #include <fcntl.h>