-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix missing mypy "@OverRide" import in nfs-on-slave script
Signed-off-by: Ronan Abhamon <[email protected]>
- Loading branch information
Showing
3 changed files
with
20 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 04f353ceefd8612cef286ba11f81642771334be6 Mon Sep 17 00:00:00 2001 | ||
From e4f2b5b8a7f8ad0c5642a78c6992e2685fb49e26 Mon Sep 17 00:00:00 2001 | ||
From: Ronan Abhamon <[email protected]> | ||
Date: Fri, 8 Nov 2024 13:44:57 +0100 | ||
Subject: [PATCH 59/60] Use `override` everywhere! | ||
|
@@ -40,7 +40,7 @@ Signed-off-by: Ronan Abhamon <[email protected]> | |
drivers/linstorvolumemanager.py | 4 +- | ||
drivers/lock.py | 2 +- | ||
drivers/mpath_cli.py | 5 +- | ||
drivers/nfs-on-slave | 3 +- | ||
drivers/nfs-on-slave | 6 +- | ||
drivers/srmetadata.py | 22 ++- | ||
drivers/udevSR.py | 53 ++++-- | ||
misc/fairlock/fairlock.py | 7 +- | ||
|
@@ -72,7 +72,7 @@ Signed-off-by: Ronan Abhamon <[email protected]> | |
tests/test_storage_init.py | 14 +- | ||
tests/test_util.py | 16 +- | ||
tests/testlib.py | 13 +- | ||
65 files changed, 1293 insertions(+), 682 deletions(-) | ||
65 files changed, 1296 insertions(+), 682 deletions(-) | ||
create mode 100644 .mypy.ini | ||
|
||
diff --git a/.mypy.ini b/.mypy.ini | ||
|
@@ -5086,10 +5086,20 @@ index 4c7ce54a..357e84a0 100755 | |
|
||
mpathcmd = ["/usr/sbin/multipathd", "-k"] | ||
diff --git a/drivers/nfs-on-slave b/drivers/nfs-on-slave | ||
index 3e2ee8d3..31d498be 100644 | ||
index 3e2ee8d3..71837724 100644 | ||
--- a/drivers/nfs-on-slave | ||
+++ b/drivers/nfs-on-slave | ||
@@ -31,7 +31,8 @@ class NfsCheckException(Exception): | ||
@@ -18,6 +18,9 @@ | ||
# A plugin for synchronizing slaves when something changes on the Master | ||
|
||
import sys; sys.path.append("/opt/xensource/sm/") | ||
+ | ||
+from sm_typing import override | ||
+ | ||
import util | ||
import os, glob, errno | ||
|
||
@@ -31,7 +34,8 @@ class NfsCheckException(Exception): | ||
except: | ||
self.exe = None | ||
|
||
|
2 changes: 1 addition & 1 deletion
2
SOURCES/0060-Makefile-fix-don-t-execute-precheck-during-installat.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 6667a8e9813e519d3afa4001e99be0bc6e81c6c4 Mon Sep 17 00:00:00 2001 | ||
From 59ed5e3e899df39cc993aefee2edc6e5e80bb140 Mon Sep 17 00:00:00 2001 | ||
From: Ronan Abhamon <[email protected]> | ||
Date: Thu, 7 Nov 2024 15:50:22 +0100 | ||
Subject: [PATCH 60/60] Makefile fix: don't execute precheck during | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,7 +6,7 @@ | |
Summary: sm - XCP storage managers | ||
Name: sm | ||
Version: 3.2.3 | ||
Release: 1.14%{?xsrel}%{?dist} | ||
Release: 1.15%{?xsrel}%{?dist} | ||
License: LGPL | ||
URL: https://github.com/xapi-project/sm | ||
Source0: sm-3.2.3.tar.gz | ||
|
@@ -419,6 +419,9 @@ Manager and some other packages | |
|
||
|
||
%changelog | ||
* Thu Dec 19 2024 Ronan Abhamon <[email protected]> - 3.2.3-1.15 | ||
- Fix missing mypy "@override" import in nfs-on-slave script | ||
|
||
* Wed Dec 11 2024 Ronan Abhamon <[email protected]> - 3.2.3-1.14 | ||
- Sync fork-load-daemon script with http-nbd-transfer (v1.5.0) | ||
- Fix coalesce process for LINSTOR SRs | ||
|