[GRASS-SVN] r63311 - grass/branches/releasebranch_7_0/scripts/v.db.join

[svn_grass at osgeo.org]

Author: hellik
Date: 2014-12-01 03:15:45 -0800 (Mon, 01 Dec 2014)
New Revision: 63311

Modified:
   grass/branches/releasebranch_7_0/scripts/v.db.join/v.db.join.py
Log:
v.db.join: fix for new option syntax (merge from trunk r63309)

Modified: grass/branches/releasebranch_7_0/scripts/v.db.join/v.db.join.py
===================================================================
--- grass/branches/releasebranch_7_0/scripts/v.db.join/v.db.join.py	2014-12-01 10:56:17 UTC (rev 63310)
+++ grass/branches/releasebranch_7_0/scripts/v.db.join/v.db.join.py	2014-12-01 11:15:45 UTC (rev 63311)
@@ -66,10 +66,10 @@
     map = options['map']
     layer = options['layer']
     column = options['column']
-    otable = options['otable']
-    ocolumn = options['ocolumn']
-    if options['scolumns']:
-        scolumns = options['scolumns'].split(',')
+    otable = options['other_table']
+    ocolumn = options['other_column']
+    if options['subset_columns']:
+        scolumns = options['subset_columns'].split(',')
     else:
         scolumns = None