r43796 - in /packages/unstable/meld/debian: changelog patches/0001-meld.vc.svn-Make-repository-validity-check-relative-.patch patches/series

[rbalint at users.alioth.debian.org]

Author: rbalint
Date: Mon Oct 27 23:46:12 2014
New Revision: 43796

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=43796
Log:
Back-port patch to fix working with Subversion reposiories

Added:
    packages/unstable/meld/debian/patches/0001-meld.vc.svn-Make-repository-validity-check-relative-.patch
Modified:
    packages/unstable/meld/debian/changelog
    packages/unstable/meld/debian/patches/series

Modified: packages/unstable/meld/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/meld/debian/changelog?rev=43796&op=diff
==============================================================================
--- packages/unstable/meld/debian/changelog	[utf-8] (original)
+++ packages/unstable/meld/debian/changelog	[utf-8] Mon Oct 27 23:46:12 2014
@@ -9,6 +9,8 @@
       * Build fix to always include C locale when LINGUAS is set
         (Kai Willadsen)
     - Translation updates
+  * Back-port patch to fix working with Subversion reposiories
+    (Closes: #764671)
 
  -- Balint Reczey <balint at balintreczey.hu>  Sun, 26 Oct 2014 17:44:58 +0100
 

Added: packages/unstable/meld/debian/patches/0001-meld.vc.svn-Make-repository-validity-check-relative-.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/meld/debian/patches/0001-meld.vc.svn-Make-repository-validity-check-relative-.patch?rev=43796&op=file
==============================================================================
--- packages/unstable/meld/debian/patches/0001-meld.vc.svn-Make-repository-validity-check-relative-.patch	(added)
+++ packages/unstable/meld/debian/patches/0001-meld.vc.svn-Make-repository-validity-check-relative-.patch	[utf-8] Mon Oct 27 23:46:12 2014
@@ -0,0 +1,36 @@
+From 352f4f3cb9936e4099275d2267d7b7dea94ae6e0 Mon Sep 17 00:00:00 2001
+From: Kai Willadsen <kai.willadsen at gmail.com>
+Date: Mon, 27 Oct 2014 07:12:06 +1000
+Subject: [PATCH] meld.vc.svn: Make repository validity check relative to the
+ repo root
+
+This fixes a regression from 1.8 where we started incorrectly checking
+repository validity against the repo view location, not the actual root
+of the repository.
+---
+ meld/vc/svn.py | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/meld/vc/svn.py b/meld/vc/svn.py
+index c89372a..0ffbeb8 100644
+--- a/meld/vc/svn.py
++++ b/meld/vc/svn.py
+@@ -161,10 +161,12 @@ class Vc(_vc.CachedVc):
+         if _vc.call([cls.CMD, "info"], cwd=path):
+             return False
+ 
++        root, location = cls.is_in_repo(path)
++
+         # Check for repository version, trusting format file then entries file
+-        format_path = os.path.join(path, cls.VC_DIR, "format")
+-        entries_path = os.path.join(path, cls.VC_DIR, "entries")
+-        wcdb_path = os.path.join(path, cls.VC_DIR, "wc.db")
++        format_path = os.path.join(root, cls.VC_DIR, "format")
++        entries_path = os.path.join(root, cls.VC_DIR, "entries")
++        wcdb_path = os.path.join(root, cls.VC_DIR, "wc.db")
+         format_exists = os.path.exists(format_path)
+         entries_exists = os.path.exists(entries_path)
+         wcdb_exists = os.path.exists(wcdb_path)
+-- 
+2.1.1
+

Modified: packages/unstable/meld/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/meld/debian/patches/series?rev=43796&op=diff
==============================================================================
--- packages/unstable/meld/debian/patches/series	[utf-8] (original)
+++ packages/unstable/meld/debian/patches/series	[utf-8] Mon Oct 27 23:46:12 2014
@@ -1 +1,2 @@
 01_skip_compile_schema_and_icon_cache_update.patch
+0001-meld.vc.svn-Make-repository-validity-check-relative-.patch