2002-06-15 Robert Collins <rbtcollins@hotmail.com>

        * package_meta.cc (packagemeta::set_action): When installing packages
        with no binaries, choose the source package.

diff --git a/ChangeLog b/ChangeLog
index b036e2215f9772846d2cb4ee56f94056fef6a3fb..d8ecbe43667debba6b747e6d314b5fc05969e80c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-15  Robert Collins  <rbtcollins@hotmail.com>
+
+       * package_meta.cc (packagemeta::set_action): When installing packages
+       with no binaries, choose the source package.
+
 2002-06-10  Robert Collins  <rbtcollins@hotmail.com>
 
        * IniParseFindVisitor (IniParseFindVisitor::visitFile): Apply Max

diff --git a/package_meta.cc b/package_meta.cc
index cc78c411e4808584310ceb912957cd1f6a5f656e..b490f53d3b46fe0a98aa89a5ef04372e9834e827 100644 (file)
--- a/package_meta.cc
+++ b/package_meta.cc
@@ -468,10 +468,21 @@ packagemeta::set_action (_actions action, packageversion * default_version)
       if (desired)
        {
          if (desired != installed)
-           desired->binpicked = 1;
+           if (desired->bin.sites.number())
+             {
+               desired->binpicked = 1;
+               desired->srcpicked = 0;
+             }
+           else
+             {
+               desired->binpicked = 0;
+               desired->srcpicked = 1;
+             }
          else
-           desired->binpicked = 0;
-         desired->srcpicked = 0;
+           {
+             desired->binpicked = 0;
+             desired->srcpicked = 0;
+           }
        }
       return;
     }