summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVlad Glagolev2015-02-16 00:14:01 +0300
committerVlad Glagolev2015-02-16 13:17:12 +0300
commit4e9741cd627f470438f7a288bea3367d8df5234c (patch)
tree2b4393451d081366ba8521d13ac436dcfe67a491
parent1c0d7119bc57b660a70796f4be41ccb63237f7e2 (diff)
basesystem: fix force depends bug for wget on 'sorcery rebuild'
(cherry picked from commit 9d79d0c6a73af7a23ca0491e0d263b57e12ef9d1)
-rwxr-xr-xsmgl/basesystem/DEPENDS4
-rw-r--r--smgl/basesystem/HISTORY5
2 files changed, 8 insertions, 1 deletions
diff --git a/smgl/basesystem/DEPENDS b/smgl/basesystem/DEPENDS
index 54f9f09d75..df44670232 100755
--- a/smgl/basesystem/DEPENDS
+++ b/smgl/basesystem/DEPENDS
@@ -39,7 +39,9 @@ depends smgl-fhs &&
depends tar &&
depends TEXT-EDITOR &&
depends util-linux &&
-depends wget &&
+if [[ $FORCE_BASESYSTEM_DEPENDS != "on" ]]; then
+ depends wget
+fi &&
depends xz-utils &&
depends zlib &&
diff --git a/smgl/basesystem/HISTORY b/smgl/basesystem/HISTORY
index 2ee856310b..51e3cdbc36 100644
--- a/smgl/basesystem/HISTORY
+++ b/smgl/basesystem/HISTORY
@@ -1,3 +1,8 @@
+2015-02-16 Vlad Glagolev <stealth@sourcemage.org>
+ * DEPENDS: use FORCE_BASESYSTEM_DEPENDS check for wget to avoid the bug
+ about missing dependency flags on `sorcery -r` because of several
+ cast_self entries in TRIGGERS
+
2012-05-23 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 0.9.6
* DEPENDS: module-init-tools => MODTOOLS