25 lines
1.2 KiB
Diff
25 lines
1.2 KiB
Diff
diff -Nur qgis-2.0.1/python/plugins/processing/admintools/CMakeLists.txt qgis-2.0.1-httplib2/python/plugins/processing/admintools/CMakeLists.txt
|
|
--- qgis-2.0.1/python/plugins/processing/admintools/CMakeLists.txt 2013-09-11 01:06:52.000000000 +0200
|
|
+++ qgis-2.0.1-httplib2/python/plugins/processing/admintools/CMakeLists.txt 2013-09-28 00:07:27.581240299 +0200
|
|
@@ -1,6 +1,5 @@
|
|
FILE(GLOB PY_FILES *.py)
|
|
|
|
ADD_SUBDIRECTORY(geoserver)
|
|
-ADD_SUBDIRECTORY(httplib2)
|
|
|
|
-PLUGIN_INSTALL(processing ./admintools ${PY_FILES})
|
|
\ No newline at end of file
|
|
+PLUGIN_INSTALL(processing ./admintools ${PY_FILES})
|
|
diff -Nur qgis-2.0.1/python/plugins/processing/admintools/geoserver/catalog.py qgis-2.0.1-httplib2/python/plugins/processing/admintools/geoserver/catalog.py
|
|
--- qgis-2.0.1/python/plugins/processing/admintools/geoserver/catalog.py 2013-09-11 01:06:52.000000000 +0200
|
|
+++ qgis-2.0.1-httplib2/python/plugins/processing/admintools/geoserver/catalog.py 2013-09-28 00:08:25.495356845 +0200
|
|
@@ -36,7 +36,7 @@
|
|
from xml.etree.ElementTree import XML
|
|
from xml.parsers.expat import ExpatError
|
|
from urlparse import urlparse
|
|
-from processing.admintools import httplib2
|
|
+import httplib2
|
|
|
|
logger = logging.getLogger("gsconfig.catalog")
|
|
|