fix to mibdump.py --destination-directory handling

CHANGES.rst

@@ -1,9 +1,10 @@
 
-Revision 0.1.3, XX-04-2017
+Revision 0.1.3, XX-05-2017
 --------------------------
 
 * INET-ADDRESS-MIB configured as pre-built at pysnmp codegen
 * JSON codegen produces "nodetype" element for OBJECT-TYPE
+* Fix to mibdump.py --destination-directory option
 
 Revision 0.1.2, 12-04-2017
 --------------------------

pysmi/codegen/pysnmp.py

@@ -71,7 +71,8 @@ class PySnmpCodeGen(AbstractCodeGen):
     fakeMibs = ('ASN1',
                 'ASN1-ENUMERATION',
                 'ASN1-REFINEMENT')
-    baseMibs = ('SNMP-FRAMEWORK-MIB',
+    baseMibs = ('PYSNMP-USM-MIB',
+                'SNMP-FRAMEWORK-MIB',
                 'SNMP-TARGET-MIB',
                 'TRANSPORT-ADDRESS-MIB',
                 'INET-ADDRESS-MIB') + AbstractCodeGen.baseMibs

scripts/mibdump.py

@@ -28,6 +28,7 @@
 mibStubs = []
 mibBorrowers = []
 dstFormat = None
+dstDirectory = None
 cacheDirectory = ''
 nodepsFlag = False
 rebuildFlag = False
@@ -205,11 +206,12 @@
         mibBorrowers = [('http://mibs.snmplabs.com/pysnmp/notexts/@mib@', False),
                         ('http://mibs.snmplabs.com/pysnmp/fulltexts/@mib@', True)]
 
-    dstDirectory = os.path.expanduser("~")
-    if sys.platform[:3] == 'win':
-        dstDirectory = os.path.join(dstDirectory, 'PySNMP Configuration', 'mibs')
-    else:
-        dstDirectory = os.path.join(dstDirectory, '.pysnmp', 'mibs')
+    if not dstDirectory:
+        dstDirectory = os.path.expanduser("~")
+        if sys.platform[:3] == 'win':
+            dstDirectory = os.path.join(dstDirectory, 'PySNMP Configuration', 'mibs')
+        else:
+            dstDirectory = os.path.join(dstDirectory, '.pysnmp', 'mibs')
 
     # Compiler infrastructure
 
@@ -236,7 +238,8 @@
         mibBorrowers = [('http://mibs.snmplabs.com/json/notexts/@mib@', False),
                         ('http://mibs.snmplabs.com/json/fulltexts/@mib@', True)]
 
-    dstDirectory = os.path.join('.')
+    if not dstDirectory:
+        dstDirectory = os.path.join('.')
 
     # Compiler infrastructure
 
@@ -257,7 +260,8 @@
         mibBorrowers = [('http://mibs.snmplabs.com/null/notexts/@mib@', False),
                         ('http://mibs.snmplabs.com/null/fulltexts/@mib@', True)]
 
-    dstDirectory = ''
+    if not dstDirectory:
+        dstDirectory = ''
 
     # Compiler infrastructure