Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Nicolas Wavrant
slapos.core
Commits
2c9ea680
Commit
2c9ea680
authored
Jan 31, 2013
by
Marco Mariani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
backup slapos.xml
parent
5a09abdd
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
41 additions
and
3 deletions
+41
-3
CHANGES.txt
CHANGES.txt
+6
-0
slapos/format.py
slapos/format.py
+35
-3
No files found.
CHANGES.txt
View file @
2c9ea680
Changes
Changes
=======
=======
0.34.1 (unreleased)
-------------------
* slapos: display version number with help [Marco Mariani]
* slapformat: backup slapos.xml to a zip archive at every change [Marco Mariani]
0.34 (2013-01-23)
0.34 (2013-01-23)
-----------------
-----------------
...
...
slapos/format.py
View file @
2c9ea680
# -*- coding: utf-8 -*-
# -*- coding: utf-8 -*-
# vim: set et sts=2:
##############################################################################
##############################################################################
#
#
# Copyright (c) 2010, 2011, 2012 Vifib SARL and Contributors.
# Copyright (c) 2010, 2011, 2012 Vifib SARL and Contributors.
...
@@ -46,6 +47,15 @@ import subprocess
...
@@ -46,6 +47,15 @@ import subprocess
import
sys
import
sys
import
threading
import
threading
import
time
import
time
import
zipfile
import
lxml.etree
def
prettify_xml
(
xml
):
root
=
lxml
.
etree
.
fromstring
(
xml
)
return
lxml
.
etree
.
tostring
(
root
,
pretty_print
=
True
)
class
OS
(
object
):
class
OS
(
object
):
_os
=
os
_os
=
os
...
@@ -253,9 +263,31 @@ class Computer(object):
...
@@ -253,9 +263,31 @@ class Computer(object):
"""
"""
computer_dict
=
_getDict
(
self
)
computer_dict
=
_getDict
(
self
)
output_file
=
open
(
path_to_xml
,
'w'
)
new_xml
=
xml_marshaller
.
dumps
(
computer_dict
)
output_file
.
write
(
xml_marshaller
.
dumps
(
computer_dict
))
new_pretty_xml
=
prettify_xml
(
new_xml
)
output_file
.
close
()
path_to_archive
=
path_to_xml
+
'.zip'
if
os
.
path
.
exists
(
path_to_archive
):
# the archive file exists, we only backup if something has changed
with
open
(
path_to_xml
,
'rb'
)
as
fin
:
if
fin
.
read
()
==
new_pretty_xml
:
# computer configuration did not change, nothing to write
return
self
.
backup_xml
(
path_to_archive
,
path_to_xml
)
with
open
(
path_to_xml
,
'wb'
)
as
fout
:
fout
.
write
(
new_pretty_xml
)
def
backup_xml
(
self
,
path_to_archive
,
path_to_xml
):
xml_content
=
open
(
path_to_xml
).
read
()
saved_filename
=
path_to_xml
+
time
.
strftime
(
'.%Y%M%d-%H:%M'
)
with
zipfile
.
ZipFile
(
path_to_archive
,
'a'
)
as
archive
:
archive
.
writestr
(
saved_filename
,
xml_content
,
zipfile
.
ZIP_DEFLATED
)
@
classmethod
@
classmethod
def
load
(
cls
,
path_to_xml
,
reference
,
ipv6_interface
):
def
load
(
cls
,
path_to_xml
,
reference
,
ipv6_interface
):
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment