rev 18408 - in kde-extras/krename/trunk/debian: . patches

[Fathi Boudra]

Author: fabo
Date: 2010-06-28 18:45:43 +0000 (Mon, 28 Jun 2010)
New Revision: 18408

Added:
   kde-extras/krename/trunk/debian/patches/03_skip_equal.diff
Modified:
   kde-extras/krename/trunk/debian/changelog
   kde-extras/krename/trunk/debian/patches/series
Log:
Add 03_skip_equal.diff to skip renaming if source and target filenames are equal.

Modified: kde-extras/krename/trunk/debian/changelog
===================================================================
--- kde-extras/krename/trunk/debian/changelog	2010-06-28 18:35:32 UTC (rev 18407)
+++ kde-extras/krename/trunk/debian/changelog	2010-06-28 18:45:43 UTC (rev 18408)
@@ -1,3 +1,10 @@
+krename (4.0.4-2) unstable; urgency=low
+
+  * Add 03_skip_equal.diff to skip renaming if source and target filenames are
+    equal. Thanks to Bastian Kleineidam. (Closes: #577473)
+
+ -- Fathi Boudra <fabo at debian.org>  Mon, 28 Jun 2010 21:36:15 +0300
+
 krename (4.0.4-1) unstable; urgency=low
 
   * New upstream release.

Added: kde-extras/krename/trunk/debian/patches/03_skip_equal.diff
===================================================================
--- kde-extras/krename/trunk/debian/patches/03_skip_equal.diff	                        (rev 0)
+++ kde-extras/krename/trunk/debian/patches/03_skip_equal.diff	2010-06-28 18:45:43 UTC (rev 18408)
@@ -0,0 +1,19 @@
+Description: when renaming, moving or symlinking files, krename should check if
+             source and target are equal. The attached patch adds such a check.
+Author: Bastian Kleineidam <calvin at debian.org>
+
+--- a/src/batchrenamer.cpp
++++ b/src/batchrenamer.cpp
+@@ -239,6 +239,12 @@ void BatchRenamer::processFiles( Progres
+         KIO::JobFlags flags  = (m_overwrite ? KIO::Overwrite : KIO::DefaultFlags) | KIO::HideProgressInfo;
+         KIO::Job*     job    = NULL;
+         const KUrl &  srcUrl =  (*m_files)[i].srcUrl();
++        if (srcUrl == dstUrl) {
++            p->error( i18n("Cannot rename: source and target filename are equal: %1", srcUrl.prettyUrl()) );
++            (*m_files)[i].setError( 1 );
++            errors++;
++            continue;
++        }
+                     
+         switch( m_renameMode ) 
+         {

Modified: kde-extras/krename/trunk/debian/patches/series
===================================================================
--- kde-extras/krename/trunk/debian/patches/series	2010-06-28 18:35:32 UTC (rev 18407)
+++ kde-extras/krename/trunk/debian/patches/series	2010-06-28 18:45:43 UTC (rev 18408)
@@ -1,2 +1,3 @@
 01_portugese_translations_contrib.diff
 02_remove_desktop_deprecated_key.diff
+03_skip_equal.diff