Attachment #90747 for bug #127970

View | Details | Raw Unified | Return to bug 127970
Collapse All | Expand All

Lines 6-15 Link Here

(-)ports/devel/viewvc/Makefile (-3 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= viewvc	8	PORTNAME= viewvc
9	PORTVERSION= 1.0.5	9	PORTVERSION= 1.0.6
10	PORTREVISION= 4
11	CATEGORIES= devel python	10	CATEGORIES= devel python
12	MASTER_SITES= http://viewvc.tigris.org/files/documents/3330/41694/	11	MASTER_SITES= http://viewvc.tigris.org/files/documents/3330/43677/
13		12
14	MAINTAINER= pgollucci@FreeBSD.org	13	MAINTAINER= pgollucci@FreeBSD.org
15	COMMENT= Web-based Version Control Repository Browsing	14	COMMENT= Web-based Version Control Repository Browsing

Lines 1-3 Link Here

(-)ports/devel/viewvc/distinfo (-3 / +3 lines)
1	MD5 (viewvc-1.0.5.tar.gz) = 8fc8107f937b9da481b14333a7fdb29d	1	MD5 (viewvc-1.0.6.tar.gz) = 882bfbf31773dc3981a8514ca045a30a
2	SHA256 (viewvc-1.0.5.tar.gz) = 0caf17fa0137231c0a78a5c57e758da73475212516d4758fe521def007a8fddd	2	SHA256 (viewvc-1.0.6.tar.gz) = ad56d2ad074bbd09ff1a1968164fd0f14f01241864366e0931d0a265bbff8752
3	SIZE (viewvc-1.0.5.tar.gz) = 522323	3	SIZE (viewvc-1.0.6.tar.gz) = 520839




Index: bin/mod_python/viewvc.py
===================================================================
--- bin/mod_python/viewvc.py	(revision 1992)
+++ bin/mod_python/viewvc.py	(revision 1993)
@@ -42,9 +42,15 @@
   sys.path.insert(0, LIBRARY_DIR)
 
 import sapi
-import viewvc
-reload(viewvc) # need reload because initial import loads this stub file
+import imp
 
+# Import real ViewVC module
+fp, pathname, description = imp.find_module('viewvc', [LIBRARY_DIR])
+try:
+  viewvc = imp.load_module('viewvc', fp, pathname, description)
+finally:
+  if fp:
+    fp.close()
 
 def index(req):
   server = sapi.ModPythonServer(req)
Index: bin/mod_python/query.py
===================================================================
--- bin/mod_python/query.py	(revision 1992)
+++ bin/mod_python/query.py	(revision 1993)
@@ -42,10 +42,24 @@
   sys.path.insert(0, LIBRARY_DIR)
 
 import sapi
-import viewvc
-import query
-reload(query) # need reload because initial import loads this stub file
+import imp
 
+# Import real ViewVC module
+fp, pathname, description = imp.find_module('viewvc', [LIBRARY_DIR])
+try:
+  viewvc = imp.load_module('viewvc', fp, pathname, description)
+finally:
+  if fp:
+    fp.close()
+
+# Import real ViewVC Query modules
+fp, pathname, description = imp.find_module('query', [LIBRARY_DIR])
+try:
+  query = imp.load_module('query', fp, pathname, description)
+finally:
+  if fp:
+    fp.close()
+
 cfg = viewvc.load_config(CONF_PATHNAME)
 
 def index(req):

Return to bug 127970

Removed Link Here

(-)ports/devel/viewvc/files/patch-svn-r1993 (-54 lines)
1	Index: bin/mod_python/viewvc.py
2	===================================================================
3	--- bin/mod_python/viewvc.py (revision 1992)
4	+++ bin/mod_python/viewvc.py (revision 1993)
5	@@ -42,9 +42,15 @@
6	sys.path.insert(0, LIBRARY_DIR)
7
8	import sapi
9	-import viewvc
10	-reload(viewvc) # need reload because initial import loads this stub file
11	+import imp
12
13	+# Import real ViewVC module
14	+fp, pathname, description = imp.find_module('viewvc', [LIBRARY_DIR])
15	+try:
16	+ viewvc = imp.load_module('viewvc', fp, pathname, description)
17	+finally:
18	+ if fp:
19	+ fp.close()
20
21	def index(req):
22	server = sapi.ModPythonServer(req)
23	Index: bin/mod_python/query.py
24	===================================================================
25	--- bin/mod_python/query.py (revision 1992)
26	+++ bin/mod_python/query.py (revision 1993)
27	@@ -42,10 +42,24 @@
28	sys.path.insert(0, LIBRARY_DIR)
29
30	import sapi
31	-import viewvc
32	-import query
33	-reload(query) # need reload because initial import loads this stub file
34	+import imp
35
36	+# Import real ViewVC module
37	+fp, pathname, description = imp.find_module('viewvc', [LIBRARY_DIR])
38	+try:
39	+ viewvc = imp.load_module('viewvc', fp, pathname, description)
40	+finally:
41	+ if fp:
42	+ fp.close()
43	+
44	+# Import real ViewVC Query modules
45	+fp, pathname, description = imp.find_module('query', [LIBRARY_DIR])
46	+try:
47	+ query = imp.load_module('query', fp, pathname, description)
48	+finally:
49	+ if fp:
50	+ fp.close()
51	+
52	cfg = viewvc.load_config(CONF_PATHNAME)
53
54	def index(req):