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

        * package_version.cc (packageversion::sources): Implement this.
        * download.cc (do_download_thread): Support multiple files per package.

diff --git a/ChangeLog b/ChangeLog
index d737a8df1082badb5442c6bedad8e1342191cd1e..634f974982b909c0ac9b14a14d4934a696883717 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-07-15  Robert Collins  <rbtcollins@hotmail.com>
+
+       * package_version.cc (packageversion::sources): Implement this.
+       * download.cc (do_download_thread): Support multiple files per package.
+
 2002-07-15  Robert Collins  <rbtcollins@hotmail.com>
 
        * package_version.h (packageversion::sources): Support multiple files in

diff --git a/download.cc b/download.cc
index 2fa30a6379c5d1947ad17e8271d2455b793b1d03..6a375a9c84172106369d039e1c58ee41388bfefb 100644 (file)
--- a/download.cc
+++ b/download.cc
@@ -235,11 +235,22 @@ do_download_thread (HINSTANCE h, HWND owner)
          packageversion sourceversion = version.sourcePackage();
          try 
            {
-             if (version.picked() && !check_for_cached (*version.source()))
-                 total_download_bytes += version.source()->size;
-             if (sourceversion.picked ()
-                 && !check_for_cached (*sourceversion.source()))
-                 total_download_bytes += sourceversion.source()->size;
+             if (version.picked())
+               {
+                 for (vector<packagesource>::iterator i = 
+                      version.sources ()->begin(); 
+                      i != version.sources ()->end(); ++i)
+                   if (!check_for_cached (*i))
+                     total_download_bytes += i->size;
+               }
+             if (sourceversion.picked ())
+               {
+                 for (vector<packagesource>::iterator i =
+                      sourceversion.sources ()->begin();
+                      i != sourceversion.sources ()->end(); ++i)
+                   if (!check_for_cached (*i))
+                     total_download_bytes += i->size;
+               }
            }
          catch (Exception * e)
            {
@@ -265,9 +276,19 @@ do_download_thread (HINSTANCE h, HWND owner)
          packageversion version = pkg.desired;
          packageversion sourceversion = version.sourcePackage();
          if (version.picked())
-           e += download_one (*version.source(), owner);
+           {
+             for (vector<packagesource>::iterator i =
+                  version.sources ()->begin();
+                  i != version.sources ()->end(); ++i)
+               e += download_one (*i, owner);
+           }
          if (sourceversion && sourceversion.picked())
-           e += download_one (*sourceversion.source(), owner);
+           {
+             for (vector<packagesource>::iterator i =
+                  sourceversion.sources ()->begin();
+                  i != sourceversion.sources ()->end(); ++i)
+               e += download_one (*i, owner);
+           }
          errors += e;
 #if 0
          if (e)

diff --git a/package_version.cc b/package_version.cc
index 570b6703b51d4533a5ee0a430cfc2155d95c0469..c40c50a6519ee92e6c46bcb2b88485b9746c3a40 100644 (file)
--- a/package_version.cc
+++ b/package_version.cc
@@ -285,6 +285,12 @@ packageversion::source ()
   return &data->sources[0];
 }
 
+vector<packagesource> *
+packageversion::sources ()
+{
+  return &data->sources;
+}
+
 bool
 packageversion::accessible() const
 {