From d57d18fe0e051eec8e60ef57fe411f3b1f1f08fd Mon Sep 17 00:00:00 2001
From: Patrick Uiterwijk <puiterwijk@redhat.com>
Date: Jul 11 2016 10:18:48 +0000
Subject: Use more specific paths to binaries for pre-usrmove compatibility


Move some binary calls to their actual specific location where
they were before the usrmove.
This will allow us to support operating systems that don't have the
usrmove.

Signed-off-by: Howard Johnson <merlin@merlinthp.org>
Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com>
Reviewed-by: Pierre-Yves Chibon <pingou@pingoured.fr>

---

diff --git a/ipsilon/install/ipsilon-server-install b/ipsilon/install/ipsilon-server-install
index 2559357..33e3596 100755
--- a/ipsilon/install/ipsilon-server-install
+++ b/ipsilon/install/ipsilon-server-install
@@ -229,7 +229,7 @@ def install(plugins, args):
     files.fix_user_dirs(instance_conf, opts['system_user'])
     files.fix_user_dirs(args['data_dir'], opts['system_user'])
     try:
-        subprocess.call(['/usr/sbin/restorecon', '-R', args['data_dir']])
+        subprocess.call(['/sbin/restorecon', '-R', args['data_dir']])
     except Exception:  # pylint: disable=broad-except
         pass
 
diff --git a/quickrun.py b/quickrun.py
index 3189ba4..ce7eb94 100755
--- a/quickrun.py
+++ b/quickrun.py
@@ -59,13 +59,13 @@ def config(workdir):
     text = t.substitute({'workdir': workdir})
     with open(sql, 'w+') as f:
         f.write(text)
-    subprocess.call(['sqlite3', '-init', sql, admin_db, '.quit'])
+    subprocess.call(['/usr/bin/sqlite3', '-init', sql, admin_db, '.quit'])
 
     users_db = os.path.join(workdir, 'userprefs.sqlite')
     sql = os.path.join(workdir, 'users.sql')
     with open(sql, 'w+') as f:
         f.write(USERS_TEMPLATE)
-    subprocess.call(['sqlite3', '-init', sql, users_db, '.quit'])
+    subprocess.call(['/usr/bin/sqlite3', '-init', sql, users_db, '.quit'])
 
     trans_db = os.path.join(workdir, 'transactions.sqlite')
     cachedir = os.path.join(workdir, 'cache')
diff --git a/tests/dbupgrades.py b/tests/dbupgrades.py
index 0e6518f..bfa3788 100755
--- a/tests/dbupgrades.py
+++ b/tests/dbupgrades.py
@@ -64,7 +64,7 @@ class IpsilonTest(IpsilonTestBase):
                 db_in = os.path.join(db_indir, '%s.sqlite.dump' % database)
                 db_out = os.path.join(db_outdir, '%s.sqlite' % database)
                 os.unlink(db_out)
-                cmd = ['/bin/sqlite3', db_out, '.read %s' % db_in]
+                cmd = ['/usr/bin/sqlite3', db_out, '.read %s' % db_in]
                 subprocess.check_call(cmd)
 
             # Upgrade that database
@@ -80,7 +80,7 @@ class IpsilonTest(IpsilonTestBase):
             # Check all features in a newly created database
             # Let's verify if at least one index was created
             test_db = os.path.join(db_outdir, 'adminconfig.sqlite')
-            p = subprocess.Popen(['/bin/sqlite3', test_db, '.dump'],
+            p = subprocess.Popen(['/usr/bin/sqlite3', test_db, '.dump'],
                                  stdout=subprocess.PIPE)
             output, _ = p.communicate()
             if p.returncode:
@@ -95,7 +95,7 @@ class IpsilonTest(IpsilonTestBase):
             # In 1 -> 2, we added indexes and primary keys
             # Let's verify if at least one index was created
             test_db = os.path.join(db_outdir, 'adminconfig.sqlite')
-            p = subprocess.Popen(['/bin/sqlite3', test_db, '.dump'],
+            p = subprocess.Popen(['/usr/bin/sqlite3', test_db, '.dump'],
                                  stdout=subprocess.PIPE)
             output, _ = p.communicate()
             if p.returncode: