summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-03-20 22:10:53 -0400
committerJoey Hess <joey@kodama.kitenet.net>2008-03-20 22:10:53 -0400
commit7164735eaf5a84a7547e5ef5491675b9fe289ded (patch)
tree1c243647cbce0845c394fc3e928ada25d125a25b
parentb8e9ed27c42a49bf2d524ae7dce1e03a206156dc (diff)
Revert "Add support for RPM (note: untested!)"
This reverts commit 2d0f02f740f73bafba187584184ec26fdf1cc3aa. This shouldn't have been in the nobinary branch, I am not yet decided about merging the packagelist branch.
-rwxr-xr-xinit.d/60create-packagelist13
-rwxr-xr-xpost-install.d/10update-packagelist13
2 files changed, 4 insertions, 22 deletions
diff --git a/init.d/60create-packagelist b/init.d/60create-packagelist
index 351d5aa..ccac425 100755
--- a/init.d/60create-packagelist
+++ b/init.d/60create-packagelist
@@ -1,14 +1,5 @@
#!/bin/sh
set -e
-# NOTE: the output of this command should always be emtpy!
-# diff init.d/60create-packagelist post-install.d/10update-packagelist
-# todo: fix this with symlinks? Or with metadata.d?
-
-if [ "$LOWLEVEL_PACKAGE_MANAGER" = dpkg ]; then
- # The output is already sorted
- dpkg-query --show > /etc/package-list
-elif [ "$LOWLEVEL_PACKAGE_MANAGER" = "rpm" ]; then
- rpm -qa | sort > /etc/package-list
-fi
-
+# The output is already sorted
+dpkg-query --show > /etc/package-list
diff --git a/post-install.d/10update-packagelist b/post-install.d/10update-packagelist
index 351d5aa..ccac425 100755
--- a/post-install.d/10update-packagelist
+++ b/post-install.d/10update-packagelist
@@ -1,14 +1,5 @@
#!/bin/sh
set -e
-# NOTE: the output of this command should always be emtpy!
-# diff init.d/60create-packagelist post-install.d/10update-packagelist
-# todo: fix this with symlinks? Or with metadata.d?
-
-if [ "$LOWLEVEL_PACKAGE_MANAGER" = dpkg ]; then
- # The output is already sorted
- dpkg-query --show > /etc/package-list
-elif [ "$LOWLEVEL_PACKAGE_MANAGER" = "rpm" ]; then
- rpm -qa | sort > /etc/package-list
-fi
-
+# The output is already sorted
+dpkg-query --show > /etc/package-list