test: Substitute GNU commands for other commands where available

[apt.git] / methods / rred.cc

diff --git a/methods/rred.cc b/methods/rred.cc
index 678509844ddb8fad162c609d71714f01265dd2d4..0c641ad826e65724f18a7aa8c4dd7bc8d1f29cac 100644 (file)
--- a/methods/rred.cc
+++ b/methods/rred.cc
@@ -572,7 +572,7 @@ class RredMethod : public aptMethod {
 
    protected:
       virtual bool URIAcquire(std::string const &Message, FetchItem *Itm) APT_OVERRIDE {
 
    protected:
       virtual bool URIAcquire(std::string const &Message, FetchItem *Itm) APT_OVERRIDE {

-        Debug = _config->FindB("Debug::pkgAcquire::RRed", false);
+        Debug = DebugEnabled();

         URI Get = Itm->Uri;
         std::string Path = Get.Host + Get.Path; // rred:/path - no host
 
         URI Get = Itm->Uri;
         std::string Path = Get.Host + Get.Path; // rred:/path - no host
 


@@ -664,7 +664,7 @@ class RredMethod : public aptMethod {
            std::cerr << "FAILED to open inp " << Path << std::endl;
            return _error->Error("Failed to open inp %s", Path.c_str());
         }
            std::cerr << "FAILED to open inp " << Path << std::endl;
            return _error->Error("Failed to open inp %s", Path.c_str());
         }

-        if (out.Open(Itm->DestFile, FileFd::WriteOnly | FileFd::Create | FileFd::BufferedWrite, FileFd::Extension) == false)
+        if (out.Open(Itm->DestFile, FileFd::WriteOnly | FileFd::Create | FileFd::Empty | FileFd::BufferedWrite, FileFd::Extension) == false)

         {
            std::cerr << "FAILED to open out " << Itm->DestFile << std::endl;
            return _error->Error("Failed to open out %s", Itm->DestFile.c_str());
         {
            std::cerr << "FAILED to open out " << Itm->DestFile << std::endl;
            return _error->Error("Failed to open out %s", Itm->DestFile.c_str());


@@ -762,7 +762,7 @@ int main(int argc, char **argv)
       FileFd out, inp;
       std::cerr << "Patching " << argv[2] << " into " << argv[3] << "\n";
       inp.Open(argv[2], FileFd::ReadOnly,FileFd::Extension);
       FileFd out, inp;
       std::cerr << "Patching " << argv[2] << " into " << argv[3] << "\n";
       inp.Open(argv[2], FileFd::ReadOnly,FileFd::Extension);

-      out.Open(argv[3], FileFd::WriteOnly | FileFd::Create | FileFd::BufferedWrite, FileFd::Extension);
+      out.Open(argv[3], FileFd::WriteOnly | FileFd::Create | FileFd::Empty | FileFd::BufferedWrite, FileFd::Extension);

       patch.apply_against_file(out, inp);
       out.Close();
    } else if (just_diff) {
       patch.apply_against_file(out, inp);
       out.Close();
    } else if (just_diff) {