Skip to content

S
slapos.core
Commit a351d16c authored by Łukasz Nowak's avatar Łukasz Nowak
Browse files
Options

Merge remote-tracking branch 'origin/master' into performance-hack

parents 7f20653e 4323bacc
Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 262 deletions
CHANGES.txt
View file @ a351d16c
Changes Changes
======= =======
0.23 (unreleased) 0.24 (Unreleased)
----------------- -----------------
* No change yet * No change yet.
0.23 (2012-02-29)
-----------------
* slapgrid : Don't create tarball of sofwtare release when shacache is not
configured. [Yingjie Xu]
0.22 (2012-02-09) 0.22 (2012-02-09)
----------------- -----------------
......
master/bt5/vifib_data_simulation/PathTemplateItem/business_process_module/vifib_simple_sale_business_process/invoice.xml deleted 100644 → 0
View file @ 7f20653e
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Business Link" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_Access_contents_information_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Associate</string>
<string>Auditor</string>
<string>Author</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Add_portal_content_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Associate</string>
<string>Author</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Modify_portal_content_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Associate</string>
<string>Author</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
<item>
<key> <string>_View_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Associate</string>
<string>Auditor</string>
<string>Author</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
<item>
<key> <string>_identity_criterion</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>_local_properties</string> </key>
<value>
<tuple>
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>modification_date</string> </value>
</item>
<item>
<key> <string>type</string> </key>
<value> <string>date</string> </value>
</item>
</dictionary>
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>creation_date</string> </value>
</item>
<item>
<key> <string>type</string> </key>
<value> <string>date</string> </value>
</item>
</dictionary>
</tuple>
</value>
</item>
<item>
<key> <string>_range_criterion</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
<key> <string>categories</string> </key>
<value>
<tuple>
<string>trade_phase/vifib/invoicing</string>
<string>predecessor/trade_state/delivered</string>
<string>successor/trade_state/invoiced</string>
<string>delivery_builder/portal_deliveries/vifib_sale_invoice_builder</string>
</tuple>
</value>
</item>
<item>
<key> <string>completed_state</string> </key>
<value>
<tuple>
<string>confirmed</string>
<string>delivered</string>
<string>started</string>
<string>stopped</string>
</tuple>
</value>
</item>
<item>
<key> <string>creation_date</string> </key>
<value>
<object>
<klass>
<global id="1.1" name="DateTime" module="DateTime.DateTime"/>
</klass>
<tuple>
<none/>
</tuple>
<state>
<tuple>
<float>1324249200.0</float>
<string>GMT+1</string>
</tuple>
</state>
</object>
</value>
</item>
<item>
<key> <string>deliverable</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>description</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>frozen_state</string> </key>
<value>
<tuple>
<string>delivered</string>
<string>stopped</string>
</tuple>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>invoice</string> </value>
</item>
<item>
<key> <string>int_index</string> </key>
<value> <int>3</int> </value>
</item>
<item>
<key> <string>language</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>modification_date</string> </key>
<value>
<object>
<klass> <reference id="1.1"/> </klass>
<tuple>
<none/>
</tuple>
<state>
<tuple>
<float>1324249200.0</float>
<string>GMT+1</string>
</tuple>
</state>
</object>
</value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Business Link</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>invoice</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<global name="PersistentMapping" module="Persistence.mapping"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>data</string> </key>
<value>
<dictionary/>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<tuple>
<global name="PersistentMapping" module="Persistence.mapping"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>data</string> </key>
<value>
<dictionary/>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/vifib_data_simulation/bt/revision
View file @ a351d16c
125 126
\ No newline at end of file \ No newline at end of file
master/bt5/vifib_upgrader/ExtensionTemplateItem/VifibUpgrader.py
View file @ a351d16c
...@@ -21,7 +21,6 @@ def DeliveryLineSetZeroPriceAndOrUpdateAppliedRule(self): ...@@ -21,7 +21,6 @@ def DeliveryLineSetZeroPriceAndOrUpdateAppliedRule(self):
self.setQuantity(0.0) self.setQuantity(0.0)
else: else:
self.setQuantity(1.0) self.setQuantity(1.0)
self.Delivery_updateAppliedRule()
@WorkflowMethod.disable @WorkflowMethod.disable
def OpenSaleOrder_migrate(self): def OpenSaleOrder_migrate(self):
......
master/bt5/vifib_upgrader/bt/revision
View file @ a351d16c
73 75
\ No newline at end of file \ No newline at end of file
setup.py
View file @ a351d16c
...@@ -2,7 +2,7 @@ from setuptools import setup, find_packages ...@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
import glob import glob
import os import os
version = '0.23-dev' version = '0.24-dev'
name = 'slapos.core' name = 'slapos.core'
long_description = open("README.txt").read() + "\n" + \ long_description = open("README.txt").read() + "\n" + \
open("CHANGES.txt").read() + "\n" open("CHANGES.txt").read() + "\n"
......
slapos/grid/SlapObject.py
View file @ a351d16c
...@@ -92,27 +92,33 @@ class Software(object): ...@@ -92,27 +92,33 @@ class Software(object):
self.signature_certificate_list): self.signature_certificate_list):
tar = tarfile.open(tarpath) tar = tarfile.open(tarpath)
try: try:
self.logger.info("Extracting archive of cached software release...")
tar.extractall(path=self.software_root) tar.extractall(path=self.software_root)
finally: finally:
tar.close() tar.close()
else: else:
self._install_from_buildout() self._install_from_buildout()
tar = tarfile.open(tarpath, "w:gz") if (self.software_root and self.url and self.software_url_hash \
try: and self.upload_binary_cache_url \
tar.add(self.software_path, arcname=self.software_url_hash) and self.upload_binary_dir_url):
finally: self.logger.info("Creating archive of software release...")
tar.close() tar = tarfile.open(tarpath, "w:gz")
upload_network_cached( try:
self.software_root, tar.add(self.software_path, arcname=self.software_url_hash)
self.url, self.software_url_hash, finally:
self.upload_binary_cache_url, tar.close()
self.upload_binary_dir_url, self.logger.info("Trying to upload archive of software release...")
tarpath, self.logger, upload_network_cached(
self.signature_private_key_file, self.software_root,
self.shacache_cert_file, self.url, self.software_url_hash,
self.shacache_key_file, self.upload_binary_cache_url,
self.shadir_cert_file, self.upload_binary_dir_url,
self.shadir_key_file) tarpath, self.logger,
self.signature_private_key_file,
self.shacache_cert_file,
self.shacache_key_file,
self.shadir_cert_file,
self.shadir_key_file)
shutil.rmtree(cache_dir) shutil.rmtree(cache_dir)
def _install_from_buildout(self): def _install_from_buildout(self):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7