diff options
| -rwxr-xr-x | contrib/packager.sh | 11 | ||||
| -rw-r--r-- | tutorius/properties.py | 3 |
2 files changed, 8 insertions, 6 deletions
diff --git a/contrib/packager.sh b/contrib/packager.sh index c1bf752..a2ad9c5 100755 --- a/contrib/packager.sh +++ b/contrib/packager.sh @@ -105,12 +105,13 @@ if [ -e tutorius.iso ];then rm tutorius.iso fi lbl=`egrep -o "CDLABEL=\S*" $ISO_PATH/isolinux/isolinux.cfg | head -n 1 | cut -d = -f 2` +timestamp=`date +%Y%m%d` mkisofs -b isolinux/isolinux.bin -c isolinux/boot.cat -o tutorius.iso -no-emul-boot -boot-load-size 4 -boot-info-table -V $lbl -J -r -hide-rr-moved iso/ -mv tutorius.iso /var/www/isos/tutorius-`date +%Y%m%d`.iso -ln -sf /var/www/isos/tutorius-`date +%Y%m%d`.iso /var/www/isos/current.iso -chown a+r /var/www/isos/tutorius-`date +%Y%m%d`.iso -md5sum /var/www/isos/tutorius-`date +%Y%m%d`.iso > /var/www/isos/tutorius-`date +%Y%m%d`.md5 -shasum /var/www/isos/tutorius-`date +%Y%m%d`.iso > /var/www/isos/tutorius-`date +%Y%m%d`.sha +mv tutorius.iso /var/www/isos/tutorius-$timestamp.iso +ln -sf /var/www/isos/tutorius-$timestamp.iso /var/www/isos/current.iso +chown a+r /var/www/isos/tutorius-$timestamp.iso +md5sum /var/www/isos/tutorius-$timestamp.iso > /var/www/isos/tutorius-$timestamp.md5 +shasum /var/www/isos/tutorius-$timestamp.iso > /var/www/isos/tutorius-$timestamp.sha echo diff --git a/tutorius/properties.py b/tutorius/properties.py index 34b508a..abf76e5 100644 --- a/tutorius/properties.py +++ b/tutorius/properties.py @@ -24,6 +24,7 @@ from sugar.tutorius.constraints import Constraint, \ UpperLimitConstraint, LowerLimitConstraint, \ MaxSizeConstraint, MinSizeConstraint, \ ColorConstraint, FileConstraint, BooleanConstraint, EnumConstraint +from copy import copy class TPropContainer(object): """ @@ -48,7 +49,7 @@ class TPropContainer(object): # only care about TutoriusProperty instances propinstance.tname = attr_name self._props[attr_name] = propinstance.validate( - propinstance.default) + copy(propinstance.default)) def __getattribute__(self, name): """ |