Skip to content

Commit dac872b

Browse files
authored
Merge pull request #78 from hnez/no-service
usbsdmux: remove the deprecated service/client code paths
2 parents 8a1782b + 658f5a1 commit dac872b

File tree

3 files changed

+0
-58
lines changed

3 files changed

+0
-58
lines changed

pyproject.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ documentation="https://www.linux-automation.com/usbsdmux-M01/"
2929
[project.scripts]
3030
usbsdmux = "usbsdmux.__main__:main"
3131
usbsdmux-configure = "usbsdmux.usb2642eeprom:main"
32-
usbsdmux-service = "usbsdmux.service:main"
3332

3433
[tool.setuptools]
3534
packages = [

usbsdmux/__main__.py

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -54,26 +54,8 @@ def main():
5454

5555
subparsers.add_parser("info", help="Show information about the SD card")
5656

57-
# These arguments were previously used for the client/service
58-
# based method to grant USB-SD-Mux access to non-root users.
59-
# The client/service model is no longer needed due to new udev
60-
# rules and a change to how the /dev/sg* devices are accessed.
61-
# Display a warning but do not fail when these are used so
62-
# existing scripts do not break and can be upgraded gracefully.
63-
parser.add_argument("-d", "--direct", help=argparse.SUPPRESS, action="store_true", default=None)
64-
parser.add_argument("-c", "--client", help=argparse.SUPPRESS, action="store_true", default=None)
65-
parser.add_argument("-s", "--socket", help=argparse.SUPPRESS, default=None)
66-
6757
args = parser.parse_args()
6858

69-
if any(arg is not None for arg in (args.direct, args.client, args.socket)):
70-
print(
71-
"usbsdmux: usage of -s/-c/-d arguments is deprecated "
72-
"as the service/client split is no longer required. "
73-
"Please upgrade your scripts to not supply either of these arguments",
74-
file=sys.stderr,
75-
)
76-
7759
config = Config(args.config)
7860

7961
try:

usbsdmux/service.py

Lines changed: 0 additions & 39 deletions
This file was deleted.

0 commit comments

Comments
 (0)