diff options
author | Mike Frysinger <vapier@gentoo.org> | 2006-08-20 04:23:10 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2006-08-20 04:23:10 +0000 |
commit | 935148dff62716ad72b00d0abe8730f5efe8921e (patch) | |
tree | 49f3155c39fb6f236bf8f7ccb59007b9deb25b3d /sys-apps/hdparm | |
parent | spruce up the init.d and default config files (diff) | |
download | historical-935148dff62716ad72b00d0abe8730f5efe8921e.tar.gz historical-935148dff62716ad72b00d0abe8730f5efe8921e.tar.bz2 historical-935148dff62716ad72b00d0abe8730f5efe8921e.zip |
really fix default arg check #142777
Package-Manager: portage-2.1.1_pre5-r2
Diffstat (limited to 'sys-apps/hdparm')
-rw-r--r-- | sys-apps/hdparm/Manifest | 14 | ||||
-rw-r--r-- | sys-apps/hdparm/files/hdparm-init-7 | 6 |
2 files changed, 11 insertions, 9 deletions
diff --git a/sys-apps/hdparm/Manifest b/sys-apps/hdparm/Manifest index 60dc63ec3d5b..b96aa4612417 100644 --- a/sys-apps/hdparm/Manifest +++ b/sys-apps/hdparm/Manifest @@ -5,10 +5,10 @@ AUX hdparm-conf.d.3 430 RMD160 2c075ab3bf51286999860e2fa08989327bbaa1e3 SHA1 994 MD5 7905eb90e421523aa0c7f32f3d16b1fe files/hdparm-conf.d.3 430 RMD160 2c075ab3bf51286999860e2fa08989327bbaa1e3 files/hdparm-conf.d.3 430 SHA256 e3d8ce9928385e25abd388cf2d169198e03129f41d3eca1f23c96fdbe54f3462 files/hdparm-conf.d.3 430 -AUX hdparm-init-7 2985 RMD160 ff86da7604eb7764dc02502ab17f12eb55c0487b SHA1 e9943b8f2c493b353926bf264fc51caa066c3cb0 SHA256 536cf949e9ebb1dc474f2e40d5c18cc389161c17d9f73dd3d3933b257f3f8aa7 -MD5 c2b4fc94d83051c5f77aaa9ef6b35e5a files/hdparm-init-7 2985 -RMD160 ff86da7604eb7764dc02502ab17f12eb55c0487b files/hdparm-init-7 2985 -SHA256 536cf949e9ebb1dc474f2e40d5c18cc389161c17d9f73dd3d3933b257f3f8aa7 files/hdparm-init-7 2985 +AUX hdparm-init-7 3017 RMD160 93fc676ec01c255a49dea0ab4536a6854e523387 SHA1 31b7fb64737c0784d561e3fcc5fd28285717fda0 SHA256 a2ebb3b6e9c0438574b2c68b2a77373b949ebf08e729793203d2ea62d4d32878 +MD5 98f20543812ea2ae5eeacfefe03e8826 files/hdparm-init-7 3017 +RMD160 93fc676ec01c255a49dea0ab4536a6854e523387 files/hdparm-init-7 3017 +SHA256 a2ebb3b6e9c0438574b2c68b2a77373b949ebf08e729793203d2ea62d4d32878 files/hdparm-init-7 3017 DIST hdparm-6.3.tar.gz 44052 RMD160 dff66236938b7d3f60fe43505b4c0d8f4dce2386 SHA1 013ebdf957bbbd53889e910012f552343eeff4b6 SHA256 08688a6a46ba495494bf838f8f26103e797584c1888eca94e43a171e1b37246d DIST hdparm-6.6.tar.gz 45538 RMD160 714fbc5216bdb427c7e817649f3c4f5462620c13 SHA1 8d288e0c22d7ff5968f5fa507bbf56703b2f6ed9 SHA256 7e2db39a4e1f41bb327a9a8ef9e5e8359aaed0cc78e642a4ca67659629e3048b EBUILD hdparm-6.3.ebuild 980 RMD160 11c3db030680e8b5c0276df08c0f15d34e580336 SHA1 31ebf531dd5145c33e641eccb806bd4e7cbaa976 SHA256 192af9cb347beb7b9ac72a280866ad845f7e6000af584b84ca15a28cba17665a @@ -36,7 +36,7 @@ SHA256 ffaad577c213d99ad547fddf0d22ad6e096114ff29fbca4d39216acc73ac0e46 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.4 (GNU/Linux) -iD8DBQFE51BYamhnQswr0vIRAtPnAJ9ltTzPsrmGOcOFPOEeGor6FVn0aACcCPwS -Age0x/fXqEg6R2J4y91JU4U= -=ClF6 +iD8DBQFE5+P3amhnQswr0vIRAgNTAJ0UqS0JbTFgkz7FZRVmMAbmXHZYsACcDX1+ +4ay4upu/QIRvniQRMRcp5hI= +=zDzv -----END PGP SIGNATURE----- diff --git a/sys-apps/hdparm/files/hdparm-init-7 b/sys-apps/hdparm/files/hdparm-init-7 index 2b0701ae5fe9..7f43dfd5098e 100644 --- a/sys-apps/hdparm/files/hdparm-init-7 +++ b/sys-apps/hdparm/files/hdparm-init-7 @@ -25,8 +25,10 @@ depend() { } do_hdparm() { - local my_all_args="${all_args} ${!extra_args}" - if [[ -n ${args:=${my_all_args}} ]] ; then + if [[ -z ${args}${all_args}${!extra_args} ]] ; then + return 0 + fi + if [[ -n ${args:=${all_args} ${!extra_args}} ]] ; then local orgdevice=$(readlink -f ${device}) if [[ -b ${orgdevice} ]] ; then ebegin "Running hdparm on ${device}" |