diff options
| author | Michael Vogt <egon@debian-devbox> | 2013-03-01 12:06:50 +0100 |
|---|---|---|
| committer | Michael Vogt <egon@debian-devbox> | 2013-03-01 12:06:50 +0100 |
| commit | 01b810674a34e30eb8bb913b94351cdaccd57e1c (patch) | |
| tree | 93b684196c659d2b61bf256ec8eb99eea543e867 /apt-pkg | |
| parent | ca3965066270db678649ffd19479a157d95b429f (diff) | |
| parent | 0597dcd8fa8f933d8bf0d7fbea395408bf3b7e5d (diff) | |
merged from the debian-sid branch
Diffstat (limited to 'apt-pkg')
| -rw-r--r-- | apt-pkg/contrib/progress.cc | 4 | ||||
| -rw-r--r-- | apt-pkg/indexrecords.cc | 5 |
2 files changed, 5 insertions, 4 deletions
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; 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++; |