summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Bokovoy <abokovoy@redhat.com>2011-07-01 12:32:29 +0300
committerAlexander Bokovoy <abokovoy@redhat.com>2011-07-01 12:32:29 +0300
commit7860beaa2ba821a4ce29eaa41a63f5c2647f4993 (patch)
tree1704ca6ef75af8b5f23e1a7fcd2f800ec396541f
parent8d4360cff1ba0dbe60c5a072ed19eb5e358290ce (diff)
parentf6ce5cd6ce30d2081c70cf695bc151a9e7cdeef0 (diff)
downloadfreeipa-7860beaa2ba821a4ce29eaa41a63f5c2647f4993.tar.gz
freeipa-7860beaa2ba821a4ce29eaa41a63f5c2647f4993.tar.xz
freeipa-7860beaa2ba821a4ce29eaa41a63f5c2647f4993.zip
Merge branch 'ticket-1369' into testingtesting
-rwxr-xr-xipa-client/ipa-install/ipa-client-install2
1 files changed, 1 insertions, 1 deletions
diff --git a/ipa-client/ipa-install/ipa-client-install b/ipa-client/ipa-install/ipa-client-install
index f065e7f71..801cb8e32 100755
--- a/ipa-client/ipa-install/ipa-client-install
+++ b/ipa-client/ipa-install/ipa-client-install
@@ -31,7 +31,7 @@ try:
import ipaclient.ipadiscovery
import ipaclient.ipachangeconf
import ipaclient.ntpconf
- from ipapython.ipautil import run, user_input, CalledProcessError, file_exists
+ from ipapython.ipautil import run, user_input, CalledProcessError, file_exists, package_installed_name
from ipapython import ipautil
from ipapython import dnsclient
from ipapython import sysrestore