diff options
| author | Juuso Alasuutari | 2007-01-05 12:09:21 +0200 |
|---|---|---|
| committer | Jaka Kranjc | 2007-01-21 23:11:54 +0100 |
| commit | d94023d94c989d0b4dac20d8235e06be7190c148 (patch) | |
| tree | ed7d6f6cc2f615ef24094ba17f4fe98b118fa626 | |
| parent | 0ef52a62f8a5819b488e6daa2f54ed99f2f37a23 (diff) | |
wpa_supplicant: Removed redundant is_depends_enabled.function and
unnecessary nested conditionals.
| -rwxr-xr-x | net/wpa_supplicant/BUILD | 2 | ||||
| -rw-r--r-- | net/wpa_supplicant/HISTORY | 5 | ||||
| -rwxr-xr-x | net/wpa_supplicant/PRE_BUILD | 9 |
3 files changed, 9 insertions, 7 deletions
diff --git a/net/wpa_supplicant/BUILD b/net/wpa_supplicant/BUILD index 900e7cc964..c83931ce65 100755 --- a/net/wpa_supplicant/BUILD +++ b/net/wpa_supplicant/BUILD @@ -27,8 +27,6 @@ done && make && -. "$GRIMOIRE/is_depends_enabled.function" && - if is_depends_enabled $SPELL qt-x11 then make wpa_gui diff --git a/net/wpa_supplicant/HISTORY b/net/wpa_supplicant/HISTORY index 7cf81e08d6..262e3d5a63 100644 --- a/net/wpa_supplicant/HISTORY +++ b/net/wpa_supplicant/HISTORY @@ -1,3 +1,8 @@ +2007-01-05 Juuso Alasuutari <iuso@sourcemage.org> + * BUILD: Removed redundant sourcing of is_depends_enabled.function, + now in PRE_BUILD. + * PRE_BUILD: Removed unnecessary nested conditionals. + 2007-01-04 Eric Sandall <eric@sandall.us> * PRE_BUILD: For new installs, /etc/profile.d/qt.sh won't be sourced until relogin, so we need to check for QTDIR and source qt.sh if diff --git a/net/wpa_supplicant/PRE_BUILD b/net/wpa_supplicant/PRE_BUILD index a0c6b76903..969fb3dcd7 100755 --- a/net/wpa_supplicant/PRE_BUILD +++ b/net/wpa_supplicant/PRE_BUILD @@ -9,10 +9,9 @@ then sed -i "s/wpa_cli dynamic_eap_methods/wpa_cli/" Makefile fi && -source "$GRIMOIRE/is_depends_enabled.function" && +. "$GRIMOIRE/is_depends_enabled.function" && -if is_depends_enabled $SPELL qt-x11; then - if [[ -z $QTDIR ]]; then - source $TRACK_ROOT/etc/profile.d/qt.sh - fi +if [[ -z $QTDIR ]] && is_depends_enabled $SPELL qt-x11 +then + . "$TRACK_ROOT/etc/profile.d/qt.sh" fi |