test framework: Correctly generate new paths in noopchroot

[apt.git] / apt-pkg / contrib / progress.cc

diff --git a/apt-pkg/contrib/progress.cc b/apt-pkg/contrib/progress.cc
index 17a6b70e91c92886cd2c379f2e6e848bbd087463..b9301815495d053650da7b9206b2e21be972a975 100644 (file)
--- a/apt-pkg/contrib/progress.cc
+++ b/apt-pkg/contrib/progress.cc
@@ -14,6 +14,8 @@
 #include <apt-pkg/error.h>
 #include <apt-pkg/configuration.h>
 
 #include <apt-pkg/error.h>
 #include <apt-pkg/configuration.h>
 

+#include <sys/time.h>
+#include <string>

 #include <iostream>
 #include <stdio.h>
 #include <cstring>
 #include <iostream>
 #include <stdio.h>
 #include <cstring>


@@ -125,14 +127,14 @@ bool OpProgress::CheckChange(float Interval)
 // OpTextProgress::OpTextProgress - Constructor                                /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // OpTextProgress::OpTextProgress - Constructor                                /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-OpTextProgress::OpTextProgress(Configuration &Config) : 
-                               NoUpdate(false), NoDisplay(false), LastLen(0) 
+OpTextProgress::OpTextProgress(Configuration &Config) :
+                               NoUpdate(false), NoDisplay(false), LastLen(0)

 {
    if (Config.FindI("quiet",0) >= 1 || Config.FindB("quiet::NoUpdate", false) == true)
       NoUpdate = true;
 {
    if (Config.FindI("quiet",0) >= 1 || Config.FindB("quiet::NoUpdate", false) == true)
       NoUpdate = true;

-   if (Config.FindI("quiet",0) >= 2)
+   if (Config.FindI("quiet",0) >= 2 || Config.FindB("quiet::NoProgress", false) == true)

       NoDisplay = true;
       NoDisplay = true;

-};
+}

                                                                        /*}}}*/
 // OpTextProgress::Done - Clean up the display                         /*{{{*/
 // ---------------------------------------------------------------------
                                                                        /*}}}*/
 // OpTextProgress::Done - Clean up the display                         /*{{{*/
 // ---------------------------------------------------------------------


@@ -150,12 +152,12 @@ void OpTextProgress::Done()
       cout << endl;
       OldOp = string();
    }
       cout << endl;
       OldOp = string();
    }

-   
+

    if (NoUpdate == true && NoDisplay == false && OldOp.empty() == false)
    {
       OldOp = string();
    if (NoUpdate == true && NoDisplay == false && OldOp.empty() == false)
    {
       OldOp = string();

-      cout << endl;   
-   }   
+      cout << endl;
+   }

 }
                                                                        /*}}}*/
 // OpTextProgress::Update - Simple text spinner                                /*{{{*/
 }
                                                                        /*}}}*/
 // OpTextProgress::Update - Simple text spinner                                /*{{{*/


@@ -192,7 +194,7 @@ void OpTextProgress::Update()
    }
    
    // Print the spinner
    }
    
    // Print the spinner

-   snprintf(S,sizeof(S),_("\r%s... %u%%"),Op.c_str(),(unsigned int)Percent);
+   snprintf(S,sizeof(S),_("%c%s... %u%%"),'\r',Op.c_str(),(unsigned int)Percent);

    Write(S);
 
    OldOp = Op;
    Write(S);
 
    OldOp = Op;