summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick McDermott <patrick.mcdermott@libiquity.com>2020-12-09 08:53:45 (EST)
committer Patrick McDermott <patrick.mcdermott@libiquity.com>2020-12-09 08:54:26 (EST)
commita334a3a4dbbceb155cbb565249d04c0fb094f0a5 (patch)
tree1af8ccb3ea280415288caa5d3b21607be64ac439
parentda9e4a8a322311b51f6835fe62a1a80d56ae621b (diff)
resolve_deps(): Solve deps of packages with ":"
-rw-r--r--NEWS3
-rw-r--r--src/deps.sh4
2 files changed, 5 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index de0851a..b954020 100644
--- a/NEWS
+++ b/NEWS
@@ -33,6 +33,9 @@ Error handling and bug fixes:
1.32.0-1 manages "cut" and almost all other utility links using
update-alternatives, so they aren't usable until after installation.
* A potential infinite loop in the dependency solver has been fixed.
+ * The dependency solver now solves dependencies of packages whose
+ names contain ":" (such as coinstallable library development
+ packages in ProteanOS).
ProteanOS Development Kit version 2.0.1
---------------------------------------
diff --git a/src/deps.sh b/src/deps.sh
index 72a0cda..6460ff0 100644
--- a/src/deps.sh
+++ b/src/deps.sh
@@ -34,10 +34,10 @@ resolve_deps()
new_deps=''
for pkg in ${new_pkgs}; do
case "${pkg}" in
- *[!a-z0-9+.-]*) continue;;
+ *[!a-z0-9+.:-]*) continue;;
esac
new_deps="${new_deps} $(printf '%s' "${deps}" | \
- sed -n "s/^${pkg}: *//p")"
+ sed -n "s/^${pkg}: *//p")"
done
new_deps="$(printf '%s\n' ${new_deps} | sort -u)"
new_pkgs=''