Просмотр исходного кода

Adjust Dpkg::Changelog::parse_changelog() search list of parser

* scripts/Dpkg/Changelog.pm (parse_changelog): Fallback
into /usr/lib/dpkg/parsechangelog to find a changelog parser
in case $dpkglibdir points to another directory (for example
when DPKG_DATADIR is manually set).
Raphael Hertzog лет назад: 18
Родитель
Сommit
9318f742b7
2 измененных файлов с 9 добавлено и 1 удалено
  1. 7 0
      ChangeLog
  2. 2 1
      scripts/Dpkg/Changelog.pm

+ 7 - 0
ChangeLog

@@ -1,3 +1,10 @@
+2008-02-20  Raphael Hertzog  <hertzog@debian.org>
+
+	* scripts/Dpkg/Changelog.pm (parse_changelog): Fallback
+	into /usr/lib/dpkg/parsechangelog to find changelog parser
+	in case $dpkglibdir points to another directory (for example
+	when DPKG_DATADIR is manually set).
+
 2008-02-19  Frank Lichtenheld  <djpig@debian.org>
 
 	* m4/libs.m4 (DPKG_LIB_CURSES): Use libncursesw if

+ 2 - 1
scripts/Dpkg/Changelog.pm

@@ -725,7 +725,8 @@ it's passed as the parameter that follows.
 sub parse_changelog {
     my (%options) = @_;
     my @parserpath = ("/usr/local/lib/dpkg/parsechangelog",
-                      "$dpkglibdir/parsechangelog");
+                      "$dpkglibdir/parsechangelog",
+                      "/usr/lib/dpkg/parsechangelog");
     my $format = "debian";
     my $changelogfile = "debian/changelog";
     my $force = 0;