* path scoring changed, the non-symlink path is scored highest

2 files changed, 38 insertions, 21 deletions

diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc
index a91fc7181..1b9e98519 100644
--- a/apt-pkg/cdrom.cc
+++ b/apt-pkg/cdrom.cc
@@ -169,6 +169,23 @@ int pkgCdrom::Score(string Path)
       Res += 10;
    if (Path.find("/debian/") != string::npos)
       Res -= 10;
+
+   // check for symlinks in the patch leading to the actual file
+   // a symlink gets a big penalty
+   struct stat Buf;
+   string statPath = flNotFile(Path);
+   string cdromPath = _config->FindDir("Acquire::cdrom::mount","/cdrom/");
+   while(statPath != cdromPath && statPath != "./") {
+      statPath.resize(statPath.size()-1);  // remove the trailing '/'
+      if (lstat(statPath.c_str(),&Buf) == 0) {
+        if(S_ISLNK(Buf.st_mode)) {
+           Res -= 60;
+           break;
+        }
+      }
+      statPath = flNotFile(statPath); // descent
+   }
+
    return Res;
 }
 
diff --git a/po/apt-all.pot b/po/apt-all.pot
index d40d44701..45ea52b09 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: 2005-02-08 16:58+0100\n"
+"POT-Creation-Date: 2005-02-25 14:16+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"
@@ -2259,31 +2259,31 @@ msgstr ""
 msgid "rename failed, %s (%s -> %s)."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:904
+#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:894
 msgid "MD5Sum mismatch"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:718
+#: apt-pkg/acquire-item.cc:708
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
 "to manually fix this package. (due to missing arch)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:771
+#: apt-pkg/acquire-item.cc:761
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
 "manually fix this package."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:807
+#: apt-pkg/acquire-item.cc:797
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:894
+#: apt-pkg/acquire-item.cc:884
 msgid "Size mismatch"
 msgstr ""
 
@@ -2292,73 +2292,73 @@ msgstr ""
 msgid "Vendor block %s contains no fingerprint"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:487
+#: apt-pkg/cdrom.cc:503
 #, c-format
 msgid ""
 "Using CD-ROM mount point %s\n"
 "Mounting CD-ROM\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:496 apt-pkg/cdrom.cc:578
+#: apt-pkg/cdrom.cc:512 apt-pkg/cdrom.cc:594
 msgid "Identifying.. "
 msgstr ""
 
-#: apt-pkg/cdrom.cc:521
+#: apt-pkg/cdrom.cc:537
 #, c-format
 msgid "Stored Label: %s \n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:541
+#: apt-pkg/cdrom.cc:557
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:559
+#: apt-pkg/cdrom.cc:575
 msgid "Unmounting CD-ROM\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:563
+#: apt-pkg/cdrom.cc:579
 msgid "Waiting for disc...\n"
 msgstr ""
 
 #. Mount the new CDROM
-#: apt-pkg/cdrom.cc:571
+#: apt-pkg/cdrom.cc:587
 msgid "Mounting CD-ROM...\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:589
+#: apt-pkg/cdrom.cc:605
 msgid "Scanning Disc for index files..\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:627
+#: apt-pkg/cdrom.cc:643
 #, c-format
 msgid "Found %i package indexes, %i source indexes and %i signatures\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:684
+#: apt-pkg/cdrom.cc:700
 msgid "That is not a valid name, try again.\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:700
+#: apt-pkg/cdrom.cc:716
 #, c-format
 msgid ""
 "This Disc is called: \n"
 "'%s'\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:704
+#: apt-pkg/cdrom.cc:720
 msgid "Copying package lists..."
 msgstr ""
 
-#: apt-pkg/cdrom.cc:728
+#: apt-pkg/cdrom.cc:744
 msgid "Writing new source list\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:737
+#: apt-pkg/cdrom.cc:753
 msgid "Source List entries for this Disc are:\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:771
+#: apt-pkg/cdrom.cc:787
 msgid "Unmounting CD-ROM..."
 msgstr ""