Sophie

Sophie

distrib > Mandriva > 2009.0 > x86_64 > by-pkgid > d14e0e944eb986752ebaa2e71dd8a129 > files > 1

backupninja-0.9.6-2mdv2009.0.src.rpm

diff -Naur backupninja-0.9.6/handlers/dup.helper.in backupninja-0.9.6.oden/handlers/dup.helper.in
--- backupninja-0.9.6/handlers/dup.helper.in	2008-06-24 16:11:22.000000000 +0200
+++ backupninja-0.9.6.oden/handlers/dup.helper.in	2009-02-14 13:18:00.000000000 +0100
@@ -506,7 +506,7 @@
 
    # Global variables whose '*' shall not be expanded
    set -o noglob
-   dup_default_includes="/var/spool/cron/crontabs /var/backups /etc /root /home /usr/local/*bin /var/lib/dpkg/status*"
+   dup_default_includes="/var/spool/cron/crontabs /var/backups /etc /root /home /usr/local/*bin"
    dup_default_excludes="/home/*/.gnupg /home/*/.gnupg /home/*/.local/share/Trash /home/*/.Trash /home/*/.thumbnails /home/*/.beagle /home/*/.aMule /home/*/gtk-gnutella-downloads"
    set +o noglob
 
diff -Naur backupninja-0.9.6/handlers/ldap.helper.in backupninja-0.9.6.oden/handlers/ldap.helper.in
--- backupninja-0.9.6/handlers/ldap.helper.in	2008-06-23 23:09:14.000000000 +0200
+++ backupninja-0.9.6.oden/handlers/ldap.helper.in	2009-02-14 13:16:17.000000000 +0100
@@ -35,7 +35,7 @@
               inputBox "ldap action wizard" "ldapsearch requires authentication. Specify here what DN to bind as:"
               [ $? = 1 ] && return
               binddn="binddn = $REPLY"
-              require_packages ldap-utils
+              require_packages openldap-clients
               ;;
             '"ssl"') ssl="ssl = yes";;
             '"tls"') tls="tls = yes";;
diff -Naur backupninja-0.9.6/handlers/sys.helper.in backupninja-0.9.6.oden/handlers/sys.helper.in
--- backupninja-0.9.6/handlers/sys.helper.in	2008-06-24 20:57:39.000000000 +0200
+++ backupninja-0.9.6.oden/handlers/sys.helper.in	2009-02-14 13:16:32.000000000 +0100
@@ -3,7 +3,7 @@
 HELPERS="$HELPERS sys:general_hardware_and_system_info"
 
 sys_wizard() {
-   require_packages hwinfo debconf-utils
+   require_packages hwinfo
    checkBox "new sys action" "check options" \
        "packages" "list of all installed packages." on \
        "partitions" "the partition table of all disks." on  \
diff -Naur backupninja-0.9.6/handlers/sys.in backupninja-0.9.6.oden/handlers/sys.in
--- backupninja-0.9.6/handlers/sys.in	2008-06-29 09:01:29.000000000 +0200
+++ backupninja-0.9.6.oden/handlers/sys.in	2009-02-14 13:12:41.000000000 +0100
@@ -30,11 +30,11 @@
    os=debian
    debug "Debian detected"
    osversion="/etc/debian_version"
-elif [ -f /etc/redhat-release ]
+elif [ -f /etc/mandriva-release ]
 then
-   os=redhat
-   debug "Redhat detected"
-   osversion="/etc/redhat-release"
+   os=mandriva
+   debug "Mandriva detected"
+   osversion="/etc/mandriva-release"
 else
    warning "Unknown OS detected!"
 fi
@@ -55,7 +55,7 @@
    getconf packagemgroptions ' --get-selections *'
    getconf selectionsfile $parentdir/debconfsel.txt
    getconf debconfgetselections `which debconf-get-selections`
-elif [ $os = "redhat" ]
+elif [ $os = "mandriva" ]
 then
    getconf packagesfile  $parentdir/rpmpackages.txt 
    getconf packagemgr	`which rpm`
@@ -225,7 +225,7 @@
 catifexec "/bin/df" "-al"
 
 STATUS="Collecting what services run at what run level:"
-if [ $os = "redhat" ]; then
+if [ $os = "mandriva" ]; then
    catifexec "/sbin/chkconfig" "--list"
    STATUS="Collecting information about /etc/rc.d:"
    catiffile "/bin/ls /etc/rc.d/rc*.d/"
@@ -432,7 +432,7 @@
 catiffile "/etc/auto.net"
 
 STATUS="Collecting LVM information:"
-if [ $os = "redhat" ]; then
+if [ $os = "mandriva" ]; then
    catifexec "/usr/sbin/vgdisplay" "-vv"
 elif [ $os = "debian" ]; then
    catifexec "/sbin/vgdisplay" "-vv"
@@ -455,7 +455,7 @@
 STATUS="Gathering information on SELinux setup"
 catifexec "/usr/bin/selinuxconfig"
 catifexec "/usr/sbin/sestatus"
-if [ $os = "redhat" ]; then
+if [ $os = "mandriva" ]; then
    catifexec "rpm" "-q -V selinux-policy-targeted"
    catifexec "rpm" "-q -V selinux-policy-strict"
 fi
diff -Naur backupninja-0.9.6/src/ninjahelper.in backupninja-0.9.6.oden/src/ninjahelper.in
--- backupninja-0.9.6/src/ninjahelper.in	2007-02-23 19:04:04.000000000 +0100
+++ backupninja-0.9.6.oden/src/ninjahelper.in	2009-02-14 14:01:12.000000000 +0100
@@ -26,11 +26,11 @@
 ##
 require_packages() {
    for pkg in "$@"; do
-      installed=`dpkg -s $pkg | grep 'ok installed'`
-      if [ -z "$installed" ]; then 
+      installed="`LC_ALL=C rpm -q $pkg | grep 'not installed'`"
+      if ! [ -z "$installed" ]; then 
          booleanBox "install $pkg?" "This backup action requires package $pkg. Do you want to install it now?"
          if [ $? = 0 ]; then
-            apt-get install $pkg
+            urpmi $pkg
             echo "hit return to continue...."
             read
          fi
@@ -165,7 +165,7 @@
       echo -n "(yes/no): "
       read install
       if [ "$install" == "yes" ]; then
-         apt-get install dialog
+         urpmi dialog
             break
          elif [ "$install" == "no" ]; then
             exit