[Lunar-commits] <moonbase> rpmunpack: fix file conflict with rpm-old

[Zbigniew Luszpinski]

commit 022108f9594692a030642b6cebae3b87e2a43f61
Author: Zbigniew Luszpinski <zbiggy at lunar-linux.org>
Date:   Fri Oct 7 02:12:27 2011 +0200

    rpmunpack: fix file conflict with rpm-old
---
 archive/rpmunpack/BUILD |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/archive/rpmunpack/BUILD b/archive/rpmunpack/BUILD
index 7c13fc0..59be809 100644
--- a/archive/rpmunpack/BUILD
+++ b/archive/rpmunpack/BUILD
@@ -6,7 +6,7 @@
   prepare_install     &&
   install -m755 -s  rpmunpack  /usr/bin/  &&
 
-  if ! module_installed rpm ; then
+  if ! module_installed rpm && ! module_installed rpm-old ; then
     # rpm module provides /usr/bin/rpm2cpio
     install -m755 rpm2cpio /usr/bin/
   fi