summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVlad Glagolev2015-02-16 00:14:01 +0300
committerVlad Glagolev2015-02-16 00:14:01 +0300
commit9d79d0c6a73af7a23ca0491e0d263b57e12ef9d1 (patch)
treedd04c9bf1177ebdadaeec50a219b718d671e7de8
parent6bf31e0a2bdd4652e0b2def1e23ef8f1e57942b2 (diff)
basesystem: fix force depends bug for wget on 'sorcery rebuild'
-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 844a1587b9..bab23e002d 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 20eaa51f2a..1d03cfb59c 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-13 Vlad Glagolev <stealth@sourcemage.org>
* DEPENDS: added xz-utils as a required dependency, since stable sorcery
handles xz archives out of the box