Re: cmdout/svk raise unhandled exception
- From: Vincent Legoll <vincent legoll gmail com>
- To: Andrew Beyer <beyer andrew gmail com>
- Cc: meld-list <meld-list gnome org>
- Subject: Re: cmdout/svk raise unhandled exception
- Date: Wed, 22 Apr 2009 11:45:08 +0200
Could you please try the attached ?
--
Vincent Legoll
### Copyright (C) 2009 Vincent Legoll <vincent legoll gmail com>
### Redistribution and use in source and binary forms, with or without
### modification, are permitted provided that the following conditions
### are met:
###
### 1. Redistributions of source code must retain the above copyright
### notice, this list of conditions and the following disclaimer.
### 2. Redistributions in binary form must reproduce the above copyright
### notice, this list of conditions and the following disclaimer in the
### documentation and/or other materials provided with the distribution.
### THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
### IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
### OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
### IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
### INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
### NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
### DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
### THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
### (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
### THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import misc
import svn
class Vc(svn.Vc):
CMD = "svk"
NAME = "SVK"
PATCH_INDEX_RE = "^=== (.*)$"
def is_repo_root(self, location):
try:
status = misc.cmdout([self.CMD, "info"], cwd=location, stdout=misc.NULL)[1]
except OSError:
raise ValueError()
if status != 0:
raise ValueError()
return location
--- svk.py 2009-04-22 14:36:49.000000000 +0200
+++ svk-fixed.py 2009-04-22 14:38:41.000000000 +0200
@@ -31,7 +31,10 @@
PATCH_INDEX_RE = "^=== (.*)$"
def is_repo_root(self, location):
- status = misc.cmdout([self.CMD, "info"], cwd=location, stdout=misc.NULL)[1]
+ try:
+ status = misc.cmdout([self.CMD, "info"], cwd=location, stdout=misc.NULL)[1]
+ except OSError:
+ raise ValueError()
if status != 0:
raise ValueError()
return location
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]