Changeset 2414

Timestamp:

09/04/07 13:19:59 (1 year ago)

Author:

isak

Message:

Commit patches from #44 and #46 which are both closed with this commit. See changelog for details.

Files:

• main/trunk/share/apkg-dep (modified) (2 diffs)
• main/trunk/share/apkg-funclib (modified) (1 diff)

main/trunk/share/apkg-dep

@@ -825 +825 @@
-    # if so then a previous call to require failed
-    # and sorted it out so we can skip this one
+    # (but still create a dependency record)
-    if [ -e "$WORKING_DIRECTORY/prepared-rootnames" ] && grep "$required_name" "$WORKING_DIRECTORY/prepared-rootnames" >/dev/null; then
-
+
+
+
+
-        popOptE
-        return 0
@@ -890 +894 @@
-        if [[ ! -e "$autopackage_global_db_location/$required_name" ]] && [[ ! -e "$autopackage_user_db_location/$required_name" ]]; then
-            _addSkeletonFile "$required_name"
-    _forgeDependency "$ROOTNAME" "$required_name" # this will make a useless supports file, but oh well, FIXME later
-
+fi
+
-        popOptE
-        return 0

main/trunk/share/apkg-funclib

@@ -829 +829 @@
-    _loadPackageEnvironment "$autopackage_db_location/$ROOTNAME"
-
+    # remove support entries from dependencies
+    _unforgeDependencies "$ROOTNAME"
+
-    trace evaluating script_uninstall
-    trace "$script_uninstall"
-    eval "$script_uninstall"
-
-    # remove support entries from dependencies
-    _unforgeDependencies "$ROOTNAME"
-
-    # remove root database package directory and symlinks