cleanup the hash iteration. unfortunately there is no 1:1 mapping from Hashes::Suppor...

[apt.git] / methods / mirror.cc

diff --git a/methods/mirror.cc b/methods/mirror.cc
index 3d5983efa59a49b3d7b67b633daadedb923ded50..d6c5ba955fe3becdd2f555a55e50a5ae7233d776 100644 (file)
--- a/methods/mirror.cc
+++ b/methods/mirror.cc
@@ -124,9 +124,10 @@ bool MirrorMethod::Clean(string Dir)
       if (I == list.end())
         unlink(Dir->d_name);
    };
       if (I == list.end())
         unlink(Dir->d_name);
    };

-   
-   chdir(StartDir.c_str());
+

    closedir(D);
    closedir(D);

+   if (chdir(StartDir.c_str()) != 0)
+      return _error->Errno("chdir",_("Unable to change to %s"),StartDir.c_str());

    return true;   
 }
 
    return true;   
 }
 


@@ -147,9 +148,9 @@ bool MirrorMethod::DownloadMirrorFile(string mirror_uri_str)
    // append all architectures
    std::vector<std::string> vec = APT::Configuration::getArchitectures();
    for (std::vector<std::string>::const_iterator I = vec.begin();
    // append all architectures
    std::vector<std::string> vec = APT::Configuration::getArchitectures();
    for (std::vector<std::string>::const_iterator I = vec.begin();

-        I != vec.end(); I++)
+        I != vec.end(); ++I)

       if (I == vec.begin())
       if (I == vec.begin())

-         fetch += "?arch" + (*I);
+         fetch += "?arch=" + (*I);

       else
          fetch += "&arch=" + (*I);
 
       else
          fetch += "&arch=" + (*I);