Hello community,
here is the log from the commit of package viewvc for openSUSE:Factory checked
in at 2013-04-26 07:46:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/viewvc (Old)
and /work/SRC/openSUSE:Factory/.viewvc.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "viewvc", Maintainer is "dmuel...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/viewvc/viewvc.changes 2013-04-23
18:02:48.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.viewvc.new/viewvc.changes 2013-04-26
07:46:50.000000000 +0200
@@ -1,0 +2,7 @@
+Thu Apr 25 11:51:43 UTC 2013 - dmuel...@suse.com
+
+- update to 1.1.20:
+ * fix tab-to-space handling regression in markup view
+ * fix regression in root lookup handling (issue #526)
+
+-------------------------------------------------------------------
Old:
----
viewvc-1.1.19.tar.gz
New:
----
viewvc-1.1.20.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ viewvc.spec ++++++
--- /var/tmp/diff_new_pack.h1CjTK/_old 2013-04-26 07:46:52.000000000 +0200
+++ /var/tmp/diff_new_pack.h1CjTK/_new 2013-04-26 07:46:52.000000000 +0200
@@ -19,7 +19,7 @@
Name: viewvc
BuildRequires: apache2-devel
BuildRequires: python-devel
-Version: 1.1.19
+Version: 1.1.20
Release: 0
#
%define apxs /usr/sbin/apxs2
++++++ viewvc-1.1.19.tar.gz -> viewvc-1.1.20.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/viewvc-1.1.19/CHANGES new/viewvc-1.1.20/CHANGES
--- old/viewvc-1.1.19/CHANGES 2013-04-22 21:21:28.000000000 +0200
+++ new/viewvc-1.1.20/CHANGES 2013-04-24 15:26:07.000000000 +0200
@@ -1,3 +1,8 @@
+Version 1.1.20 (released 24-Apr-2013)
+
+ * fix tab-to-space handling regression in markup view
+ * fix regression in root lookup handling (issue #526)
+
Version 1.1.19 (released 22-Apr-2013)
* improve root lookup performance (issue #523)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/viewvc-1.1.19/lib/vclib/ccvs/__init__.py
new/viewvc-1.1.20/lib/vclib/ccvs/__init__.py
--- old/viewvc-1.1.19/lib/vclib/ccvs/__init__.py 2013-03-20
14:22:14.000000000 +0100
+++ new/viewvc-1.1.20/lib/vclib/ccvs/__init__.py 2013-04-23
20:57:55.000000000 +0200
@@ -18,6 +18,10 @@
return os.path.normpath(rootpath)
+def _is_cvsroot(path):
+ return os.path.exists(os.path.join(path, "CVSROOT", "config"))
+
+
def expand_root_parent(parent_path):
# Each subdirectory of PARENT_PATH that contains a child
# "CVSROOT/config" is added the set of returned roots. Or, if the
@@ -26,11 +30,9 @@
assert os.path.isabs(parent_path)
roots = {}
subpaths = os.listdir(parent_path)
- cvsroot = os.path.exists(os.path.join(parent_path, "CVSROOT", "config"))
for rootname in subpaths:
rootpath = os.path.join(parent_path, rootname)
- if cvsroot \
- or (os.path.exists(os.path.join(rootpath, "CVSROOT", "config"))):
+ if _is_cvsroot(parent_path) or _is_cvsroot(rootpath):
roots[rootname] = canonicalize_rootpath(rootpath)
return roots
@@ -39,15 +41,13 @@
"""Search PARENT_PATH for a root named ROOTNAME, returning the
canonicalized ROOTPATH of the root if found; return None if no such
root is found."""
-
- assert os.path.isabs(parent_path)
# Is PARENT_PATH itself a CVS repository? If so, we allow ROOTNAME
# to be any subdir within it. Otherwise, we expect
# PARENT_PATH/ROOTNAME to be a CVS repository.
+ assert os.path.isabs(parent_path)
rootpath = os.path.join(parent_path, rootname)
- if os.path.exists(os.path.join(parent_path, "CVSROOT", "config")):
- return canonicalize_rootpath(rootpath)
- if os.path.exists(os.path.join(rootpath, "CVSROOT", "config")):
+ if (_is_cvsroot(parent_path) and os.path.exists(rootpath)) \
+ or _is_cvsroot(rootpath):
return canonicalize_rootpath(rootpath)
return None
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/viewvc-1.1.19/lib/viewvc.py
new/viewvc-1.1.20/lib/viewvc.py
--- old/viewvc-1.1.19/lib/viewvc.py 2013-04-22 21:09:17.000000000 +0200
+++ new/viewvc-1.1.20/lib/viewvc.py 2013-04-24 15:27:13.000000000 +0200
@@ -14,7 +14,7 @@
#
# -----------------------------------------------------------------------
-__version__ = '1.1.19'
+__version__ = '1.1.20'
# this comes from our library; measure the startup time
import debug
@@ -1783,7 +1783,7 @@
for i in range(len(file_lines)):
line = file_lines[i]
if cfg.options.tabsize > 0:
- line = string.expandtabs(lin, cfg.options.tabsize)
+ line = string.expandtabs(line, cfg.options.tabsize)
line = markup_escaped_urls(sapi.escape(line))
if blame_data:
blame_item = blame_data[i]
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
