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

dpkg-source/3.0 (quilt): always provide valid name in QUILT_SERIES

* scripts/Dpkg/Source/Package/V3/quilt.pm: run_quilt() can be run
when no quilt series file exist yet. In that case we have to
provide the name of the series file that we want to create (as the
quilt command might create it). Up to now
File::Spec->rel2abs(undef) returned the name of the current
directory and we improperly used that as value of QUILT_SERIES.
This regression has been introduced in 1.14.21 while trying to
to force usage of a specific series file by setting QUILT_SERIEs.
Raphael Hertzog лет назад: 18
Родитель
Сommit
787f5f4c03
3 измененных файлов с 17 добавлено и 0 удалено
  1. 9 0
      ChangeLog
  2. 6 0
      debian/changelog
  3. 2 0
      scripts/Dpkg/Source/Package/V3/quilt.pm

+ 9 - 0
ChangeLog

@@ -1,3 +1,12 @@
+2008-08-29  Raphael Hertzog  <hertzog@debian.org>
+
+	* scripts/Dpkg/Source/Package/V3/quilt.pm: run_quilt() can be run
+	when no quilt series file exist yet. In that case we have to
+	provide the name of the series file that we want to create (as the
+	quilt command might create it). Up to now
+	File::Spec->rel2abs(undef) returned the name of the current
+	directory and we improperly used that as value of QUILT_SERIES.
+
 2008-08-26  Guillem Jover  <guillem@debian.org>
 
 	* configure.ac: Bump version to 1.14.22~.

+ 6 - 0
debian/changelog

@@ -1,5 +1,11 @@
 dpkg (1.14.22) UNRELEASED; urgency=low
 
+  [ Raphael Hertzog ]
+  * The last "small fix" actually broke conversion of source packages to
+    "3.0 (quilt)" format when they have local changes and no pre-existing
+    quilt series file. Now always provide a valid name in QUILT_SERIES.
+    Closes: #496920
+
   [ Updated dpkg translations ]
   * Brazilian Portuguese (Felipe Augusto van de Wiel).
 

+ 2 - 0
scripts/Dpkg/Source/Package/V3/quilt.pm

@@ -106,6 +106,8 @@ sub run_quilt {
         $absdir = File::Spec->rel2abs($dir);
     }
     my $series = $self->get_series_file($dir);
+    # Use default name if no series files exist yet
+    $series = "$absdir/debian/patches/series" unless defined $series;
     unless (File::Spec->file_name_is_absolute($series)) {
         $series = File::Spec->rel2abs($series);
     }