diff options
| author | Dan McDonald <danmcd@mnx.io> | 2022-07-19 11:24:20 -0400 |
|---|---|---|
| committer | Dan McDonald <danmcd@mnx.io> | 2022-07-19 11:24:20 -0400 |
| commit | 56c7f1a1c7ca3aef7200fe9d148633070f0908dc (patch) | |
| tree | 31807a50598560c84fe979887f3b14ecf8eb7d40 /usr/src/tools/onbld/Checks | |
| parent | 81f8ded9e0469715043eb450f73e96578cb80240 (diff) | |
| parent | 708bde8c8780e5414779e4d9e7a7648886a4700e (diff) | |
| download | illumos-joyent-OS-8397.tar.gz | |
[illumos-gate merge]OS-8397
commit 708bde8c8780e5414779e4d9e7a7648886a4700e
14786 remove packaging support for SPARC
commit 70143b9fb6146f632b4b5d924e508df293b600df
14769 remove support for Python 2.x
Conflicts:
manifest
usr/src/cmd/mdb/Makefile.module
usr/src/tools/onbld/Checks/DbLookups.py
Diffstat (limited to 'usr/src/tools/onbld/Checks')
| -rw-r--r-- | usr/src/tools/onbld/Checks/DbLookups.py | 2 | ||||
| -rw-r--r-- | usr/src/tools/onbld/Checks/Makefile | 4 | ||||
| -rw-r--r-- | usr/src/tools/onbld/Checks/py2/Makefile | 45 |
3 files changed, 2 insertions, 49 deletions
diff --git a/usr/src/tools/onbld/Checks/DbLookups.py b/usr/src/tools/onbld/Checks/DbLookups.py index 83a60a64dc..d396a68cbc 100644 --- a/usr/src/tools/onbld/Checks/DbLookups.py +++ b/usr/src/tools/onbld/Checks/DbLookups.py @@ -86,7 +86,7 @@ class BugDB(object): try: data = urlopen(req) - except HTTPError, e: + except HTTPError as e: if e.code == 404 or e.code == 403 or e.code == 400: raise NonExistentBug(cr) else: diff --git a/usr/src/tools/onbld/Checks/Makefile b/usr/src/tools/onbld/Checks/Makefile index b6f18bdf85..1cdd9926f7 100644 --- a/usr/src/tools/onbld/Checks/Makefile +++ b/usr/src/tools/onbld/Checks/Makefile @@ -27,9 +27,7 @@ include ../../Makefile.tools -SUBDIRS= -$(BUILDPY2TOOLS)SUBDIRS += py2 -$(BUILDPY3TOOLS)SUBDIRS += py3 +SUBDIRS=py3 all := TARGET= all install := TARGET= install diff --git a/usr/src/tools/onbld/Checks/py2/Makefile b/usr/src/tools/onbld/Checks/py2/Makefile deleted file mode 100644 index 40b2b41255..0000000000 --- a/usr/src/tools/onbld/Checks/py2/Makefile +++ /dev/null @@ -1,45 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License (the "License"). -# You may not use this file except in compliance with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# - -# -# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. -# - -# Copyright 2010, Richard Lowe -# Copyright 2014 Garrett D'Amore <garrett@damore.org> -# Copyright 2016, Joyent, Inc. -# Copyright 2018 OmniOS Community Edition (OmniOSce) Association. - -include ../Makefile.com - -PYVER = $(PYTHON_VERSION) -PYPKGVERS = $(PYTHON_PKGVERS) -PYOBJS = $(PYSRCS:%.py=%.pyc) - -include ../../../Makefile.python - -all: $(PYVERSOJBS) - -install: all $(ROOTPYFILES) - -clean: - -clobber: clean pyclobber |