diff options
| author | Boris Samorodov <bsam@FreeBSD.org> | 2009-07-24 09:55:38 +0000 |
|---|---|---|
| committer | Boris Samorodov <bsam@FreeBSD.org> | 2009-07-24 09:55:38 +0000 |
| commit | 8495566bc0d6c923a9642d4be54955cc78c93171 (patch) | |
| tree | dec763a0cd85c134ccb56d19ff8e1172e6957a71 /devel/qct | |
| parent | 85857c5f4f6bbb65f57f497cffccf13dd8289b1f (diff) | |
Notes
Diffstat (limited to 'devel/qct')
| -rw-r--r-- | devel/qct/Makefile | 3 | ||||
| -rw-r--r-- | devel/qct/files/patch-qctlib_vcs_svn.py | 35 |
2 files changed, 37 insertions, 1 deletions
diff --git a/devel/qct/Makefile b/devel/qct/Makefile index 290cf8db2329..341cc8eae631 100644 --- a/devel/qct/Makefile +++ b/devel/qct/Makefile @@ -7,10 +7,10 @@ PORTNAME= qct PORTVERSION= 1.7 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= http://qct.sourceforge.net/ \ ftp://ftp.ipt.ru/pub/download/${PORTNAME}/ -WRKSRC= ${WRKDIR}/qct MAINTAINER= bsam@FreeBSD.org COMMENT= QCT GUI commit tool @@ -19,6 +19,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:${PORTSDIR}/x11-toolkits/py-qt4 USE_PYTHON= 2.5+ USE_PYDISTUTILS=yes +WRKSRC= ${WRKDIR}/qct post-install: .if !defined(NOPORTDOCS) diff --git a/devel/qct/files/patch-qctlib_vcs_svn.py b/devel/qct/files/patch-qctlib_vcs_svn.py new file mode 100644 index 000000000000..ce824a53fc29 --- /dev/null +++ b/devel/qct/files/patch-qctlib_vcs_svn.py @@ -0,0 +1,35 @@ +--- qctlib/vcs/svn.py.orig 2009-02-15 23:49:32.000000000 +0100 ++++ qctlib/vcs/svn.py 2009-07-22 17:58:33.000000000 +0200 +@@ -84,6 +84,8 @@ class qctVcsSvn: + + if showIgnored: extra = ['--no-ignore'] + else: extra = [] ++ versionOutput = runProgram([self.svn_exe, '--version', '--quiet']) ++ version = [int(s) for s in versionOutput.split(os.linesep)[0].split('.')] + statusOutput = runProgram([self.svn_exe, '--ignore-externals'] + extra + ['status']) + recs = statusOutput.split(os.linesep) + recs.pop() # remove last entry (which is '') +@@ -91,11 +93,19 @@ class qctVcsSvn: + if pb: pb.setValue(2) + + for line in recs: +- if len(line) < 7: +- continue +- status = line[0] +- fname = line[7:] +- self.fileStatus[ fname ] = line[0:6] ++ # a 7th column was added in svn 1.6, see http://subversion.tigris.org/svn_1.6_releasenotes.html#svn-status ++ if version[0]>1 or version[0]==1 and version[1]>=6: ++ if len(line) < 8: ++ continue ++ status = line[0] ++ fname = line[8:] ++ self.fileStatus[ fname ] = line[0:7] ++ else: ++ if len(line) < 7: ++ continue ++ status = line[0] ++ fname = line[7:] ++ self.fileStatus[ fname ] = line[0:6] + if status == 'M': # modified + itemList.append('M ' + fname) |