diff options
author | 2006-02-11 04:16:14 +0000 | |
---|---|---|
committer | 2006-02-11 04:16:14 +0000 | |
commit | 3b06ae21289c22ae7764277180c06540fcebbfda (patch) | |
tree | 3ce092215e2769c7c0146072fca63d41640a0135 /sys-apps/eject/files | |
parent | Fix modular X dependencies (bug #122234, Alexey Maximov). (diff) | |
download | gentoo-2-3b06ae21289c22ae7764277180c06540fcebbfda.tar.gz gentoo-2-3b06ae21289c22ae7764277180c06540fcebbfda.tar.bz2 gentoo-2-3b06ae21289c22ae7764277180c06540fcebbfda.zip |
Fix by Stuart W. Finlayson for bug in toggle support #122256.
(Portage version: 2.1_pre4-r1)
Diffstat (limited to 'sys-apps/eject/files')
-rw-r--r-- | sys-apps/eject/files/digest-eject-2.1.0-r1 (renamed from sys-apps/eject/files/digest-eject-2.1.0) | 0 | ||||
-rw-r--r-- | sys-apps/eject/files/eject-2.1.0-toggle.patch | 40 |
2 files changed, 40 insertions, 0 deletions
diff --git a/sys-apps/eject/files/digest-eject-2.1.0 b/sys-apps/eject/files/digest-eject-2.1.0-r1 index 0257fd71f7cb..0257fd71f7cb 100644 --- a/sys-apps/eject/files/digest-eject-2.1.0 +++ b/sys-apps/eject/files/digest-eject-2.1.0-r1 diff --git a/sys-apps/eject/files/eject-2.1.0-toggle.patch b/sys-apps/eject/files/eject-2.1.0-toggle.patch new file mode 100644 index 000000000000..857622cd9a6a --- /dev/null +++ b/sys-apps/eject/files/eject-2.1.0-toggle.patch @@ -0,0 +1,40 @@ +Patch by Stuart W. Finlayson + +http://bugs.gentoo.org/122256 + +--- eject.c ++++ eject.c +@@ -1028,16 +1028,6 @@ + exit(0); + } + +- /* handle -T option */ +- if (T_option) { +- if (v_option) +- printf(_("%s: toggling tray\n"), programName); +- fd = OpenDevice(deviceName); +- ToggleTray(fd); +- HandleXOption(deviceName); +- exit(0); +- } +- + /* handle -x option only */ + if (!c_option) HandleXOption(deviceName); + +@@ -1054,6 +1044,16 @@ + if ((m_option != 1) && (pattern != 0)) + UnmountDevices(pattern); + ++ /* handle -T option */ ++ if (T_option) { ++ if (v_option) ++ printf(_("%s: toggling tray\n"), programName); ++ fd = OpenDevice(deviceName); ++ ToggleTray(fd); ++ HandleXOption(deviceName); ++ exit(0); ++ } ++ + /* handle -c option */ + if (c_option) { + if (v_option) |