* removed dead code

diff --git a/apt-pkg/acquire-method.cc b/apt-pkg/acquire-method.cc
index 13201d3108bb750c827c413be64c4211ff7432b8..180b52ad7bd689de2215834c85051578bae4d108 100644 (file)
--- 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->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);
            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 ee68c75f7d59d5a9669995b29433afd2befceba5..20691cc2c3997d2c3419867eeb39ae5d69899aa8 100644 (file)
--- 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 DestFile;
       time_t LastModified;
       bool IndexFile;

-      string ExpectedMD5;

    };
    
    struct FetchResult
    };
    
    struct FetchResult

diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index 81fa4c52f3e1594b2ed238b68c2de615f35448ca..c02fe849ff9fc85886db39969addf5a5ba9399cc 100644 (file)
--- 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";
      userstatus "status.user";
      status "/var/lib/dpkg/status";
      cdroms "cdroms.list";

+     mirrors "mirrors/";

   };
   
   // Location of the cache dir
   };
   
   // Location of the cache dir

diff --git a/po/apt-all.pot b/po/apt-all.pot
index 2355eee20cc8ff470fd524aa16ed97d01ecc42a5..c37d84be27ba9da395396b6c3f1597a15e154733 100644 (file)
--- 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"
 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"
 "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-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 ""
 #, 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
 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 ""
 #, c-format
 msgid "Unable to change to %s"
 msgstr ""