On Fri, May 15, 2020 at 07:52:10AM +0200, Antoine Jacoutot wrote:
> On Thu, May 14, 2020 at 10:47:28AM -0600, Florian Obser wrote:
> > CVSROOT: /cvs
> > Module name: ports
> > Changes by: flor...@cvs.openbsd.org 2020/05/14 10:47:28
> >
> > Modified files:
> > sysutils/salt : Makefile distinfo
> > sysutils/salt/patches: patch-salt_modules_salt_proxy_py
> > patch-salt_returners_zabbix_return_py
> > sysutils/salt/pkg: PLIST
> > Added files:
> > sysutils/salt/patches: patch-requirements_crypto_txt
> > patch-salt_utils_network_py
> > Removed files:
> > sysutils/salt/files: pf.py vmctl.py
> > sysutils/salt/patches: patch-salt_master_py
> > patch-salt_modules_openbsd_sysctl_py
> > patch-salt_modules_openbsdpkg_py
> > patch-salt_tokens_localfs_py
> > patch-salt_utils_gitfs_py
> > patch-salt_utils_verify_py
> > patch-salt_wheel_config_py
> > patch-salt_wheel_file_roots_py
> >
> > Log message:
> > Update to salt stack 3000.3.
> >
> > All the heavy lifting for updating from 2018.3 to 3000.1 by robert.
> > Trivial rebasing & updating to 3000.1 -> 3000.3 by me.
> > "Please commit" robert
> > OK robert, jasper
>
> This breaks databases/sqlports because databases/py-mysql,python3 does not
> exist.
> Please revert or add a python3 FLAVOR to databases/py-mysql.
>
> Thanks.
>
> --
> Antoine
Argh, sorry about that. I swear I will never ever commit to ports
again (after fixing this).
Now, I'm not entirely sure how to revert since the version number then
moves backwards. Also I'm not sure about the right cvs incantation...
Anyway, since py-mysql is "only" used for tests, would this be an
acceptable stop-gap?
diff --git Makefile Makefile
index 8018247174c..02ec0e13596 100644
--- Makefile
+++ Makefile
@@ -19,6 +19,7 @@ COMMENT = remote execution and configuration
management system
MODPY_EGG_VERSION = 3000.3
DISTNAME = salt-${MODPY_EGG_VERSION}
+REVISION = 0
CATEGORIES = sysutils net devel
@@ -57,19 +58,20 @@ RUN_DEPENDS +=
devel/py-progressbar${MODPY_FLAVOR}
RUN_DEPENDS += security/py-M2Crypto${MODPY_FLAVOR}
# max openfiles, soft: 3072, hard: 4096; DBus system session running...
-TEST_IS_INTERACTIVE = Yes
-PORTHOME = ${WRKDIST}
-TEST_DEPENDS = databases/py-mysql${MODPY_FLAVOR} \
- devel/git \
- devel/py-gitpython${MODPY_FLAVOR} \
- devel/py-pip${MODPY_FLAVOR} \
- devel/py-six${MODPY_FLAVOR} \
- devel/py-virtualenv${MODPY_FLAVOR} \
- devel/subversion \
- net/py-libcloud${MODPY_FLAVOR} \
- net/rabbitmq \
- sysutils/salt-testing \
- www/py-CherryPy${MODPY_FLAVOR}
+# XXX needs py-mysql python3 flavour
+#TEST_IS_INTERACTIVE = Yes
+#PORTHOME = ${WRKDIST}
+#TEST_DEPENDS = databases/py-mysql${MODPY_FLAVOR} \
+# devel/git \
+# devel/py-gitpython${MODPY_FLAVOR} \
+# devel/py-pip${MODPY_FLAVOR} \
+# devel/py-six${MODPY_FLAVOR} \
+# devel/py-virtualenv${MODPY_FLAVOR} \
+# devel/subversion \
+# net/py-libcloud${MODPY_FLAVOR} \
+# net/rabbitmq \
+# sysutils/salt-testing \
+# www/py-CherryPy${MODPY_FLAVOR}
pre-configure:
${SUBST_CMD} ${WRKSRC}/salt/returners/zabbix_return.py
--
I'm not entirely sure you are real.
