компьютера в домен. git-svn-id: http://svn.calculate.ru/overlay@1321 c91db197-33c1-4113-bf15-f8a5c547ca64atratsevskiy
mhiretskiy
15 years ago
parent
40730b533f
commit
4ef63fbac7
@ -0,0 +1,35 @@
|
||||
# Copyright 2008 Calculate Pack, http://www.calculate-linux.ru
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="2"
|
||||
|
||||
inherit distutils
|
||||
|
||||
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate2/${PN}/${P}.tar.bz2"
|
||||
|
||||
DESCRIPTION="The program of setting and storing the user account in the domain"
|
||||
HOMEPAGE="http://www.calculate-linux.ru/Calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="kde"
|
||||
|
||||
DEPEND="=sys-apps/calculate-lib-2.0.14
|
||||
>=dev-python/python-ldap-2.0[ssl]
|
||||
>=sys-auth/pam_ldap-180[ssl]
|
||||
>=sys-auth/nss_ldap-239
|
||||
>=sys-apps/keyexec-0.1.2
|
||||
>=sys-apps/hal-0.5.9
|
||||
sys-apps/keyutils
|
||||
sys-auth/pam_keystore
|
||||
kde? (
|
||||
>=kde-misc/kgtk-0.9.5[qt4] )"
|
||||
|
||||
src_unpack() {
|
||||
unpack ${A}
|
||||
cd "${S}"
|
||||
|
||||
# bugfix patch
|
||||
epatch "${FILESDIR}/bugfix-${PVR}.patch"
|
||||
}
|
||||
|
||||
@ -0,0 +1,69 @@
|
||||
diff -ruN calculate-client-2.0.16.old/pym/cl_client.py calculate-client-2.0.16/pym/cl_client.py
|
||||
--- calculate-client-2.0.16.old/pym/cl_client.py 2009-04-26 15:04:05.000000000 +0400
|
||||
+++ calculate-client-2.0.16/pym/cl_client.py 2009-05-06 10:19:15.570219689 +0400
|
||||
@@ -60,22 +60,23 @@
|
||||
if max != None:
|
||||
self.max = max
|
||||
self.title = title
|
||||
- self.label ="LOGINKDIALOG=%d" % os.getpid()
|
||||
- pipe = popen2.Popen4(self.execenv + " %s " % self.label +\
|
||||
- '/usr/bin/kdialog --progressbar "%s" %d' % (\
|
||||
- " "*(len(title)+20),self.max))
|
||||
- if pipe.poll() != 0:
|
||||
- time.sleep(0.5)
|
||||
- if pipe.poll() == 0:
|
||||
- self.kdialog = pipe.fromchild.readline().strip()
|
||||
- while not "org.kde.kdialog" in self.kdialog:
|
||||
- s = fout.fromchild.readline()
|
||||
- if s == "":
|
||||
- self.shutdownDialog()
|
||||
- self.kdialog = s.strip()
|
||||
- self.setTitle(self.title)
|
||||
- else:
|
||||
- self.shutdownDialog()
|
||||
+ if os.system('which kdialog >/dev/null') == 0:
|
||||
+ self.label ="LOGINKDIALOG=%d" % os.getpid()
|
||||
+ pipe = popen2.Popen4(self.execenv + " %s " % self.label +\
|
||||
+ '/usr/bin/kdialog --progressbar "%s" %d' % (\
|
||||
+ " "*(len(title)+20),self.max))
|
||||
+ if pipe.poll() != 0:
|
||||
+ time.sleep(0.5)
|
||||
+ if pipe.poll() == 0:
|
||||
+ self.kdialog = pipe.fromchild.readline().strip()
|
||||
+ while not "org.kde.kdialog" in self.kdialog:
|
||||
+ s = fout.fromchild.readline()
|
||||
+ if s == "":
|
||||
+ self.shutdownDialog()
|
||||
+ self.kdialog = s.strip()
|
||||
+ self.setTitle(self.title)
|
||||
+ else:
|
||||
+ self.shutdownDialog()
|
||||
|
||||
def shutdownDialog(self):
|
||||
'''Принудительно уничтожить процесс kdialog'''
|
||||
@@ -1019,10 +1020,12 @@
|
||||
--set-ldap_root=%s --set-ldap_bind=%s --set-ldap_bindpw=%s -P \
|
||||
install/6intranet" %(domain,servDn,unixDN,bindDn,bindPw)
|
||||
self.execProg(execStr)
|
||||
- textLine = self.execProg("/etc/init.d/dbus restart")
|
||||
- if not "ok" in textLine:
|
||||
- self.printWARNING(_("Error restarting /etc/init.d/dbus")+ " ...")
|
||||
- return False
|
||||
+ if os.path.exists('/etc/init.d/dbus'):
|
||||
+ textLines = self.execProg("/etc/init.d/dbus restart", False, False)
|
||||
+ if not (textLines and type(textLines) == types.ListType and\
|
||||
+ "ok" in textLines[-1] or textLines and "ok" in textLines):
|
||||
+ self.printWARNING(_("Error restarting /etc/init.d/dbus")+ " ...")
|
||||
+ return False
|
||||
self.printOK(_("Computer added to domain %s")%domain + " ...")
|
||||
return True
|
||||
|
||||
@@ -1601,7 +1604,7 @@
|
||||
# Отмонтируем пользовательские ресурсы в случае ошибки
|
||||
self.errorAndUnmountUserRes = True
|
||||
return False
|
||||
- # если репликации нет, то prevHost и remote_host одинковые
|
||||
+ # если репликации нет, то prevHost и remote_host одинаковые
|
||||
else:
|
||||
prevHost=self.clVars.Get('cl_remote_host')
|
||||
# Синхронизируем настройки пользователя
|
||||
Loading…
Reference in new issue