From 291f47791d2c0d8521922c8d3090e2aa6f099d5b Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Wed, 9 Jan 2013 06:33:56 +0100
Subject: * apt-pkg/contrib/progress.cc:   - Make "..." translatable to fix
 inconsistencies in the output     of e.g. apt-get update. While this adds new
 translatable strings,     not having translations for them will not break
 anything.     Thanks to Guillem Jover. Closes: #696225

---
 apt-pkg/contrib/progress.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'apt-pkg')

diff --git a/apt-pkg/contrib/progress.cc b/apt-pkg/contrib/progress.cc
index 317048845..17a6b70e9 100644
--- a/apt-pkg/contrib/progress.cc
+++ b/apt-pkg/contrib/progress.cc
@@ -176,7 +176,7 @@ void OpTextProgress::Update()
 	 if (OldOp.empty() == false)
 	    cout << endl;
 	 OldOp = "a";
-	 cout << Op << "..." << flush;
+	 cout << Op << _("...") << flush;
       }
       
       return;
@@ -192,7 +192,7 @@ void OpTextProgress::Update()
    }
    
    // Print the spinner
-   snprintf(S,sizeof(S),"\r%s... %u%%",Op.c_str(),(unsigned int)Percent);
+   snprintf(S,sizeof(S),_("\r%s... %u%%"),Op.c_str(),(unsigned int)Percent);
    Write(S);
 
    OldOp = Op;
-- 
cgit v1.2.3


From 8d326119082e239e17c4179de77a77911414d2df Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Thu, 24 Jan 2013 18:55:44 +0100
Subject: * apt-pkg/indexrecords.cc:   - support '\r' in the Release file

---
 apt-pkg/indexrecords.cc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'apt-pkg')

diff --git a/apt-pkg/indexrecords.cc b/apt-pkg/indexrecords.cc
index af2639beb..649b6059d 100644
--- a/apt-pkg/indexrecords.cc
+++ b/apt-pkg/indexrecords.cc
@@ -173,7 +173,7 @@ bool indexRecords::parseSumData(const char *&Start, const char *End,	/*{{{*/
    Hash = "";
    Size = 0;
    /* Skip over the first blank */
-   while ((*Start == '\t' || *Start == ' ' || *Start == '\n')
+   while ((*Start == '\t' || *Start == ' ' || *Start == '\n' || *Start == '\r')
 	  && Start < End)
       Start++;
    if (Start >= End)
@@ -215,7 +215,8 @@ bool indexRecords::parseSumData(const char *&Start, const char *End,	/*{{{*/
    
    EntryEnd = Start;
    /* Find the end of the third entry (the filename) */
-   while ((*EntryEnd != '\t' && *EntryEnd != ' ' && *EntryEnd != '\n')
+   while ((*EntryEnd != '\t' && *EntryEnd != ' ' && 
+           *EntryEnd != '\n' && *EntryEnd != '\r')
 	  && EntryEnd < End)
       EntryEnd++;
 
-- 
cgit v1.2.3