[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdevplatform/plugins/subversion
From:       Andreas Pakulat <apaku () gmx ! de>
Date:       2009-09-13 12:37:03
Message-ID: 1252845423.035563.21001.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1022887 by apaku:

svn doesn't like trailing slashes or double "//" in its files or urls,
so make sure we're passing around a clean version.
BUG:202335


 M  +7 -2      svnimportjob.cpp  


--- trunk/KDE/kdevplatform/plugins/subversion/svnimportjob.cpp #1022886:1022887
@@ -22,6 +22,7 @@
 #include "svnimportjob_p.h"
 
 #include <QMutexLocker>
+#include <QFileInfo>
 
 #include <klocale.h>
 #include <kdebug.h>
@@ -45,13 +46,17 @@
     try
     {
         QMutexLocker l( m_mutex );
-        QByteArray srcba = m_sourceDirectory.toLocalFile().toUtf8();
+        QString srcdir = QFileInfo( m_sourceDirectory.toLocalFile() ).canonicalFilePath();
+        QByteArray srcba = srcdir.toUtf8();
         QByteArray destba = m_destinationRepository.repositoryServer().toUtf8();
+        if( destba.right(1) == "/" ) {
+            destba = destba.left(destba.length() - 1);
+        }
         QByteArray msg = m_message.toUtf8();
         cli.import( svn::Path( srcba.data() ), destba.data(), msg.data(), true );
     }catch( svn::ClientException ce )
     {
-        kDebug(9510) << "Exception while importing: "
+        kDebug() << "Exception while importing: "
                 << m_sourceDirectory
                 << QString::fromUtf8( ce.message() );
         setErrorMessage( QString::fromUtf8( ce.message() ) );
[prev in list] [next in list] [prev in thread] [next in thread]