25 lines
1.2 KiB
Diff
25 lines
1.2 KiB
Diff
diff -Nur qgis-2.2.0/python/plugins/processing/admintools/CMakeLists.txt qgis-2.2.0-httplib2/python/plugins/processing/admintools/CMakeLists.txt
|
|
--- qgis-2.2.0/python/plugins/processing/admintools/CMakeLists.txt 2014-02-22 09:48:47.000000000 +0100
|
|
+++ qgis-2.2.0-httplib2/python/plugins/processing/admintools/CMakeLists.txt 2014-02-22 20:37:24.158591564 +0100
|
|
@@ -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.2.0/python/plugins/processing/admintools/geoserver/catalog.py qgis-2.2.0-httplib2/python/plugins/processing/admintools/geoserver/catalog.py
|
|
--- qgis-2.2.0/python/plugins/processing/admintools/geoserver/catalog.py 2014-02-22 09:48:47.000000000 +0100
|
|
+++ qgis-2.2.0-httplib2/python/plugins/processing/admintools/geoserver/catalog.py 2014-02-22 20:36:11.366380941 +0100
|
|
@@ -41,7 +41,7 @@
|
|
UnsavedLayerGroup
|
|
from processing.admintools.geoserver.workspace import workspace_from_index, \
|
|
Workspace
|
|
-from processing.admintools import httplib2
|
|
+import httplib2
|
|
|
|
|
|
logger = logging.getLogger('gsconfig.catalog')
|