pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Reenable the IOS module, it' s included in this package. FortiOS and NX-OS remain disabled because prerequisites have yet to be packaged.



Module Name:	pkgsrc-wip
Committed By:	Havard Eidnes <he%NetBSD.org@localhost>
Pushed By:	he
Date:		Thu Feb 25 16:45:54 2016 +0100
Changeset:	78809c4de46afe5829da2d46085ab679d2870ab8

Modified Files:
	py-napalm/Makefile
	py-napalm/distinfo
	py-napalm/patches/patch-napalm_____init____.py

Log Message:
Reenable the IOS module, it's included in this package.
FortiOS and NX-OS remain disabled because prerequisites
have yet to be packaged.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=78809c4de46afe5829da2d46085ab679d2870ab8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 py-napalm/Makefile                             |  2 +-
 py-napalm/distinfo                             |  2 +-
 py-napalm/patches/patch-napalm_____init____.py | 22 ++++++++--------------
 3 files changed, 10 insertions(+), 16 deletions(-)

diffs:
diff --git a/py-napalm/Makefile b/py-napalm/Makefile
index 90ce122..2a95416 100644
--- a/py-napalm/Makefile
+++ b/py-napalm/Makefile
@@ -2,7 +2,7 @@
 
 DISTNAME=	napalm-0.51.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	-https://github.com/napalm-automation/napalm/archive/${PKGVERSION_NOREV}${EXTRACT_SUFX}
 
diff --git a/py-napalm/distinfo b/py-napalm/distinfo
index 54c5b30..124cd73 100644
--- a/py-napalm/distinfo
+++ b/py-napalm/distinfo
@@ -4,4 +4,4 @@ SHA1 (napalm-0.51.0.tar.gz) = 0e6d1737799aa705d6d62e74ebe3c879196b5c73
 RMD160 (napalm-0.51.0.tar.gz) = d77028e76ed653304fca19cfea444b971b320943
 SHA512 (napalm-0.51.0.tar.gz) = 99d749a50ee7d09c1a0de994055d86fd5f9603daa14fd73c847ffe9dc6ed8315d27758c16cb22a8d8dfcc031d80f24e41b0870b1b52d60530df167677661cd56
 Size (napalm-0.51.0.tar.gz) = 292674 bytes
-SHA1 (patch-napalm_____init____.py) = 94c69335ab934fae9f17bc242dc1ff27e6bf96e6
+SHA1 (patch-napalm_____init____.py) = 7781d1fe1630c0ea29aac99b8db74476f122f7e2
diff --git a/py-napalm/patches/patch-napalm_____init____.py b/py-napalm/patches/patch-napalm_____init____.py
index 6ef9377..08078b4 100644
--- a/py-napalm/patches/patch-napalm_____init____.py
+++ b/py-napalm/patches/patch-napalm_____init____.py
@@ -1,34 +1,28 @@
 $NetBSD$
 
+Comment out modules where we've not packaged the prerequisites yet.
+
 --- napalm/__init__.py.orig	2016-02-08 08:22:24.000000000 +0000
 +++ napalm/__init__.py
-@@ -15,10 +15,10 @@
+@@ -15,8 +15,8 @@
  from eos import EOSDriver
  from iosxr import IOSXRDriver
  from junos import JunOSDriver
 -from fortios import FortiOSDriver
 -from nxos import NXOSDriver
--from ibm import IBMDriver
--from ios import IOSDriver
 +# from fortios import FortiOSDriver
 +# from nxos import NXOSDriver
-+# from ibm import IBMDriver
-+# from ios import IOSDriver
+ from ibm import IBMDriver
+ from ios import IOSDriver
  
- def get_network_driver(vendor):
-     driver_mapping = {
-@@ -28,10 +28,10 @@ def get_network_driver(vendor):
+@@ -28,8 +28,8 @@ def get_network_driver(vendor):
          'IOSXR': IOSXRDriver,
          'JUNOS': JunOSDriver,
          'JUNIPER': JunOSDriver,
 -        'FORTIOS': FortiOSDriver,
 -        'NXOS': NXOSDriver,
--        'IBM': IBMDriver,
--        'IOS' : IOSDriver,
 +#        'FORTIOS': FortiOSDriver,
 +#        'NXOS': NXOSDriver,
-+#        'IBM': IBMDriver,
-+#        'IOS' : IOSDriver,
+         'IBM': IBMDriver,
+         'IOS' : IOSDriver,
      }
-     try:
-         return driver_mapping[vendor.upper()]


Home | Main Index | Thread Index | Old Index