From 39e1be0ff93e3084b7cb98b6a7d0c272a8b296b0 Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Tue, 6 Feb 2007 11:06:15 +0100
Subject: [PATCH] * removed dead code
---
apt-pkg/acquire-method.cc | 1 -
apt-pkg/acquire-method.h | 1 -
doc/examples/configure-index | 1 +
po/apt-all.pot | 6 +++---
4 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/apt-pkg/acquire-method.cc b/apt-pkg/acquire-method.cc
index 13201d310..180b52ad7 100644
--- a/apt-pkg/acquire-method.cc
+++ b/apt-pkg/acquire-method.cc
@@ -373,7 +373,6 @@ int pkgAcqMethod::Run(bool Single)
Tmp->Uri = LookupTag(Message,"URI");
Tmp->DestFile = LookupTag(Message,"FileName");
- Tmp->ExpectedMD5 = LookupTag(Message,"ExpectedMD5");
if (StrToTime(LookupTag(Message,"Last-Modified"),Tmp->LastModified) == false)
Tmp->LastModified = 0;
Tmp->IndexFile = StringToBool(LookupTag(Message,"Index-File"),false);
diff --git a/apt-pkg/acquire-method.h b/apt-pkg/acquire-method.h
index ee68c75f7..20691cc2c 100644
--- a/apt-pkg/acquire-method.h
+++ b/apt-pkg/acquire-method.h
@@ -33,7 +33,6 @@ class pkgAcqMethod
string DestFile;
time_t LastModified;
bool IndexFile;
- string ExpectedMD5;
};
struct FetchResult
diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index 81fa4c52f..c02fe849f 100644
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -184,6 +184,7 @@ Dir "/"
userstatus "status.user";
status "/var/lib/dpkg/status";
cdroms "cdroms.list";
+ mirrors "mirrors/";
};
// Location of the cache dir
diff --git a/po/apt-all.pot b/po/apt-all.pot
index 2355eee20..c37d84be2 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-01 12:41+0100\n"
+"POT-Creation-Date: 2007-02-06 10:56+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1330,7 +1330,7 @@ msgstr ""
#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
-#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 methods/mirror.cc:81
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 methods/mirror.cc:82
#, c-format
msgid "Unable to read %s"
msgstr ""
@@ -1956,7 +1956,7 @@ msgid "Unable to stat the mount point %s"
msgstr ""
#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
-#: methods/mirror.cc:87
+#: methods/mirror.cc:88
#, c-format
msgid "Unable to change to %s"
msgstr ""
--
2.47.2