From: Raphael Hertzog <hertzog@debian.org>
Date: Mon, 14 Apr 2008 16:28:29 +0000 (+0200)
Subject: dpkg-source: fix an error message about unrepresentable changes to source
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4cc394a0dd81a4321eb5ca91956eba1a755b9b71;p=dpkg

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.
---

diff --git a/ChangeLog b/ChangeLog
index 6f04675a..1ad0cafc 100644
--- a/ChangeLog
+++ b/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
diff --git a/debian/changelog b/debian/changelog
index 8819e923..c9b72933 100644
--- a/debian/changelog
+++ b/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).
diff --git a/scripts/Dpkg/Source/Patch.pm b/scripts/Dpkg/Source/Patch.pm
index f3d0e840..6a3ac90f 100644
--- a/scripts/Dpkg/Source/Patch.pm
+++ b/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();
 }