diff options
| author | Bor Kraljič | 2011-09-12 17:25:03 +0200 |
|---|---|---|
| committer | Vlad Glagolev | 2011-10-02 21:19:46 +0400 |
| commit | 36919ece752231d9045b26fde9cfdd4b830c243f (patch) | |
| tree | ec40d9f9046fbe31431a93bd2a26a73b8053f56c | |
| parent | dceb484cc353c8c8a198c23a185284a03c40f84f (diff) | |
udev: use the latest version of {,PRE}SUB_DEPENDS for REPAIR not some ancient
(cherry picked from commit 65d8386f8e15fa65593bd5be87e45bcb4494b289)
| -rw-r--r-- | disk/udev/HISTORY | 3 | ||||
| -rwxr-xr-x | disk/udev/REPAIR^all^PRE_SUB_DEPENDS | 10 | ||||
| -rwxr-xr-x | disk/udev/REPAIR^all^SUB_DEPENDS | 9 |
3 files changed, 19 insertions, 3 deletions
diff --git a/disk/udev/HISTORY b/disk/udev/HISTORY index aea9a4b859..600cae4e22 100644 --- a/disk/udev/HISTORY +++ b/disk/udev/HISTORY @@ -1,3 +1,6 @@ +2011-09-12 Bor Kraljič <pyrobor@ver.si> + * REPAIR^all^{,PRE}SUB_DEPENDS: use the latest version for REPAIR not some ancient + 2011-08-30 Vlad Glagolev <stealth@sourcemage.org> * BUILD: killed another typo diff --git a/disk/udev/REPAIR^all^PRE_SUB_DEPENDS b/disk/udev/REPAIR^all^PRE_SUB_DEPENDS index 34515c6e2b..5922183874 100755 --- a/disk/udev/REPAIR^all^PRE_SUB_DEPENDS +++ b/disk/udev/REPAIR^all^PRE_SUB_DEPENDS @@ -1,5 +1,9 @@ case $THIS_SUB_DEPENDS in - EXTRAS) list_find "$UDEV_OPTS" --enable-extras;; -*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}" ; - return 1;; + EXTRAS) message "the spell you are trying to cast is broken." + message "Udev's sub_depends have changed, contact the maintainer." ;; + GUDEV) is_depends_enabled $SPELL glib2 && return 0 ;; + ACL) is_depends_enabled $SPELL acl && return 0 ;; + HWDB) list_find "$UDEV_HWDB" --enable-hwdb ;; + *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}" + return 1;; esac diff --git a/disk/udev/REPAIR^all^SUB_DEPENDS b/disk/udev/REPAIR^all^SUB_DEPENDS new file mode 100755 index 0000000000..f078172d8c --- /dev/null +++ b/disk/udev/REPAIR^all^SUB_DEPENDS @@ -0,0 +1,9 @@ +case "$THIS_SUB_DEPENDS" in + EXTRAS) message "${PROBLEM_COLOR}EXTRAS is obsolete, please fix the spell using it${DEFAULT_COLOR}" ;; + GUDEV) depends glib2 '--enable-gudev' ;; + ACL) depends acl '--enable-udev_acl' ;; + HWDB) list_remove UDEV_HWDB '--disable-hwdb' + list_add UDEV_HWDB '--enable-hwdb' ;; + *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}" && + return 1;; +esac |