commit 9ce1fac11f1b1830c39468d79e9c934060f7394e Author: Хирецкий Михаил Date: Wed Oct 31 11:40:49 2012 +0400 init diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..d645695 --- /dev/null +++ b/LICENSE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/README b/README new file mode 100644 index 0000000..ad5f327 --- /dev/null +++ b/README @@ -0,0 +1,15 @@ +AUTHOR: Calculate Ltd. + +INSTALL +------- + +calculate-update needs the following library version installed, in order to run: + Python >= 2.7 + python-ldap >= 2.0.0 + pyxml >= 0.8 + calculate-lib >= 3.1.0 + +To install calculate-update, just execute the install script 'setup.py'. +Example: + + ./setup.py install diff --git a/setup.py b/setup.py new file mode 100755 index 0000000..1ba7694 --- /dev/null +++ b/setup.py @@ -0,0 +1,34 @@ +#!/usr/bin/env python2 +# -*- coding: utf-8 -*- + +# setup.py --- Setup script for calculate-update + +# Copyright 2012 Calculate Ltd. http://www.calculate-linux.org +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +__app__ = "calculate-update" +__version__ = "3.1.0" + +from distutils.core import setup + +setup( + name = 'calculate-update', + version = "3.1.0_beta2", + description = "Update system utilities", + author = "Calculate Ltd.", + author_email = "support@calculate.ru", + url = "http://calculate-linux.org", + license = "http://www.apache.org/licenses/LICENSE-2.0", + package_dir = {'calculate.update': "update"}, + packages = ['calculate.update','calculate.update.variables']) diff --git a/update/__init__.py b/update/__init__.py new file mode 100644 index 0000000..8d1c8b6 --- /dev/null +++ b/update/__init__.py @@ -0,0 +1 @@ + diff --git a/update/cl_update.py b/update/cl_update.py new file mode 100644 index 0000000..327890c --- /dev/null +++ b/update/cl_update.py @@ -0,0 +1,104 @@ +#-*- coding: utf-8 -*- + +# Copyright 2010 Calculate Ltd. http://www.calculate-linux.org +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import os +from os import path +import re +import sys +import pwd +import time +import traceback + +from datavars import DataVarsUpdate, DataVars, __version__,__app__ + +from calculate.lib.cl_template import Template, ProgressTemplate,TemplatesError +from calculate.lib.utils.files import runOsCommand, isMount +from calculate.lib.utils.common import getpathenv,appendProgramToEnvFile, \ + removeProgramToEnvFile +from calculate.core.server.func import safetyWrapper + +from calculate.lib.cl_lang import setLocalTranslate,getLazyLocalTranslate +setLocalTranslate('cl_update3',sys.modules[__name__]) +__ = getLazyLocalTranslate(_) + +class UpdateError(Exception): + """Update Error""" + +class Update: + """ + Update logic object + + Has fundamental method update for system update + """ + + def __init__(self): + self.homeDir = "" + self.clTempl = None + self.clVars = None + + def displayTemplatesApplied(self,dirsFiles): + """ + Display templates are applied (--verbose) + """ + self.printSUCCESS(_("The following files were changed")+":") + for nameF in dirsFiles[1]: + nameFile = nameF + if nameFile[:1] != "/": + nameFile = "/" + nameFile + self.printSUCCESS(" "*5 + nameFile) + + def applyTemplatesFromUser(self): + """Apply templates for user""" + if self.clTempl: + self.closeClTemplate() + self.clTempl = ProgressTemplate(self.setProgress,self.clVars, + cltObj=False) + dirsFiles = self.clTempl.applyTemplates() + if self.clTempl.getError(): + self.printERROR(self.clTempl.getError().strip()) + return False + else: + if self.verbose: + self.displayTemplatesApplied(dirsFiles) + return dirsFiles + + def initVars(self,datavars=None): + """Primary variables initialization""" + if not datavars: + self.clVars = DataVarsDesktop() + self.clVars.importDesktop() + self.clVars.flIniFile() + else: + self.clVars = datavars + + def closeClTemplate(self): + if self.clTempl: + if self.clTempl.cltObj: + self.clTempl.cltObj.closeFiles() + self.clTempl.closeFiles() + self.clTempl = None + + + @safetyWrapper(native_errors=(TemplatesError,UpdateError), + man_int=__("Update manually interrupted"), + post_action=closeClTemplate, + success_message=__("Update finished!")) + def update(self, datavars=None): + """ + Creating user profile and userdir + """ + self.initVars(datavars) + return True diff --git a/update/cl_wsdl_update.py b/update/cl_wsdl_update.py new file mode 100644 index 0000000..8f07aed --- /dev/null +++ b/update/cl_wsdl_update.py @@ -0,0 +1,84 @@ +# Copyright 2012 Calculate Ltd. http://www.calculate-linux.org +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import soaplib, sys, time, os +import threading + +from soaplib.serializers.primitive import String, Integer, Any, Boolean +from soaplib.serializers.clazz import Array, ClassSerializer +from soaplib.service import rpc, DefinitionBase +from calculate.core.server.api_types import ReturnedMessage +from calculate.core.server.api_types import ChoiceValue, Table, Option, Field, \ + GroupField, ViewInfo, ViewParams +from calculate.lib.datavars import VariableError,DataVarsError +from calculate.update.cl_update import UpdateError + +from cl_update import Update,DataVarsUpdate +import cl_update +from calculate.lib.cl_lang import setLocalTranslate,getLazyLocalTranslate +from calculate.core.server.decorators import Dec +from calculate.core.server.func import catchExcept +core_method = Dec.core_method +setLocalTranslate('cl_update3',sys.modules[__name__]) +import traceback +from functools import wraps,WRAPPER_ASSIGNMENTS + +__ = getLazyLocalTranslate(_) + +class UpdateInfo(ClassSerializer): + """Parameters for method install""" + cl_update_world = String + + Default = Array(String) + CheckOnly = Boolean + CheckAll = Boolean + +updateCatchExcept = catchExcept(VariableError,DataVarsError, + cl_update.UpdateError) + +class Wsdl: + """ + cl-update + """ + @rpc(Integer, UpdateInfo, _returns = Array(ReturnedMessage)) + @core_method(category=__('Update'),title=__('Update world'), + image='preferences-desktop', + gui=True,command='cl-update', + rights=['update']) + def update(self, sid, info): + return self.callMethod(sid,info,method_name="update", + logicClass=Desktop, + method="update") + + def update_vars(self,dv=None): + if not dv: + dv = DataVarsUpdate() + dv.importUpdate() + dv.flIniFile() + dv.Set('cl_action','update',True) + dv.addGroup(None, + normal=('cl_update_world',), + next_label=_("Update")) + return dv + + @rpc(Integer, ViewParams,_returns = ViewInfo) + def update_view (self, sid, params): + dv = self.get_cache(sid,"update","vars") + if not dv: + dv = self.update_vars() + else: + dv.processRefresh() + view = ViewInfo(dv,viewparams=params) + self.set_cache(sid, 'update', "vars",dv,smart=False) + return view diff --git a/update/datavars.py b/update/datavars.py new file mode 100644 index 0000000..c939e7d --- /dev/null +++ b/update/datavars.py @@ -0,0 +1,34 @@ +#-*- coding: utf-8 -*- + +# Copyright 2012 Calculate Ltd. http://www.calculate-linux.org +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +__app__ = 'calculate-update' +__version__ = '3.1.0' + +import os +import sys +from calculate.lib.datavars import DataVars + +from calculate.lib.cl_lang import setLocalTranslate +setLocalTranslate('cl_update3',sys.modules[__name__]) + +class DataVarsUpdate(DataVars): + """Variable class for desktop package""" + + def importUpdate(self, **args): + """Import desktop variables""" + self.importVariables() + self.importVariables('calculate.update.variables') + self.defaultModule = "update" diff --git a/update/variables/__init__.py b/update/variables/__init__.py new file mode 100644 index 0000000..2f4fe7e --- /dev/null +++ b/update/variables/__init__.py @@ -0,0 +1,19 @@ +#-*- coding: utf-8 -*- + +# Copyright 2008-2012 Calculate Ltd. http://www.calculate-linux.org +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import action + +section = "update" diff --git a/update/variables/action.py b/update/variables/action.py new file mode 100644 index 0000000..0ec7d63 --- /dev/null +++ b/update/variables/action.py @@ -0,0 +1,34 @@ +#-*- coding: utf-8 -*- + +# Copyright 2008-2012 Calculate Ltd. http://www.calculate-linux.org +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import os +import sys +from os import path +from calculate.lib.datavars import Variable,VariableError,ReadonlyVariable + +from calculate.lib.cl_lang import setLocalTranslate +setLocalTranslate('cl_update3',sys.modules[__name__]) + +class VariableAcUpdateSync(ReadonlyVariable): + """ + Action variable which has value "up" for package install and + install this package + """ + def get(self): + action = self.Get("cl_action") + if action in ("sync",): + return "world" + return "" diff --git a/update/variables/update.py b/update/variables/update.py new file mode 100644 index 0000000..4693f43 --- /dev/null +++ b/update/variables/update.py @@ -0,0 +1,54 @@ +#-*- coding: utf-8 -*- + +# Copyright 2008-2012 Calculate Ltd. http://www.calculate-linux.org +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import os +import sys +from os import path +from calculate.lib.datavars import Variable,VariableError,ReadonlyVariable + +from calculate.lib.cl_lang import setLocalTranslate +setLocalTranslate('cl_update3',sys.modules[__name__]) + +class VariableAcUpdateSync(ReadonlyVariable): + """ + Action variable which has value "up" for package install and + install this package + """ + def get(self): + action = self.Get("cl_action") + if action in ("sync",): + if self.Get('cl_update_world'): + return self.Get('cl_update_world') + return "" + +class VariableClUpdateWorld(Variable): + """ + List of action update world, rebuild world, + """ + type = "choice" + opt = ["--world"] + value = "" + #syntax = "--{choice}-world" + metavalue = 'ACTION' + + def init(self): + self.help = _("'update' - update world, 'rebuild' - rebuild world") + self.label = _("World") + + def choice(self): + return [("",_("None")), + ("update",_("Update world")), + ("rebuild","Rebuild world")]