Explorar o código

dpkg-source: fix an error message about unrepresentable changes to source

* scripts/Dpkg/Source/Patch.pm (_fail_not_same_type): Fix
inversion between new/old filetype.
Raphael Hertzog %!s(int64=18) %!d(string=hai) anos
pai
achega
4cc394a0dd
Modificáronse 3 ficheiros con 9 adicións e 2 borrados
  1. 5 0
      ChangeLog
  2. 2 0
      debian/changelog
  3. 2 2
      scripts/Dpkg/Source/Patch.pm

+ 5 - 0
ChangeLog

@@ -1,3 +1,8 @@
+2008-04-14  Raphael Hertzog  <hertzog@debian.org>
+
+	* scripts/Dpkg/Source/Patch.pm (_fail_not_same_type): Fix
+	inversion between new/old filetype.
+
 2008-04-12  Raphael Hertzog  <hertzog@debian.org>
 
 	* scripts/Dpkg/Path.pm (check_files_are_the_same): Add a new

+ 2 - 0
debian/changelog

@@ -9,6 +9,8 @@ dpkg (1.14.19) UNRELEASED; urgency=low
     Joachim for the patch.
   * Handle symlinks better when deciding if dpkg-source has to copy the
     original tarball in the current extraction directory. Closes: #475668
+  * Fix the dpkg-source error message about unrepresentable changes to
+    source because the type of a file changed (new and old were inverted).
 
   [ Updated dpkg translations ]
   * Galician (Jacobo Tarrio).

+ 2 - 2
scripts/Dpkg/Source/Patch.pm

@@ -264,8 +264,8 @@ sub _fail_not_same_type {
     my $old_type = get_type($old);
     my $new_type = get_type($new);
     errormsg(_g("cannot represent change to %s:"), $new);
-    errormsg(_g("  new version is %s"), $old_type);
-    errormsg(_g("  old version is %s"), $new_type);
+    errormsg(_g("  new version is %s"), $new_type);
+    errormsg(_g("  old version is %s"), $old_type);
     $self->register_error();
 }