projects
/
grml2usb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update version
[grml2usb.git]
/
grml2usb
diff --git
a/grml2usb
b/grml2usb
index
b84165e
..
bd4752c
100755
(executable)
--- a/
grml2usb
+++ b/
grml2usb
@@
-22,7
+22,7
@@
import uuid
import struct
# global variables
import struct
# global variables
-PROG_VERSION = "0.9.2
8
"
+PROG_VERSION = "0.9.2
9~git
"
MOUNTED = set() # register mountpoints
TMPFILES = set() # register tmpfiles
DATESTAMP = time.mktime(datetime.datetime.now().timetuple()) # unique identifier for syslinux.cfg
MOUNTED = set() # register mountpoints
TMPFILES = set() # register tmpfiles
DATESTAMP = time.mktime(datetime.datetime.now().timetuple()) # unique identifier for syslinux.cfg
@@
-1159,22
+1159,30
@@
def update_grml_versions(iso_mount, target):
logging.warn("Warning: %s could not be found - can not install it", iso_grml_version_file)
return False
try:
logging.warn("Warning: %s could not be found - can not install it", iso_grml_version_file)
return False
try:
+ # read the flavours from the iso image
iso_versions = {}
iso_file = open(iso_grml_version_file, 'r')
for line in iso_file:
iso_versions[get_flavour(line)] = line.strip()
iso_versions = {}
iso_file = open(iso_grml_version_file, 'r')
for line in iso_file:
iso_versions[get_flavour(line)] = line.strip()
+ # update the existing flavours on the target
for line in fileinput.input([target_grml_version_file], inplace=1):
flavour = get_flavour(line)
if flavour in iso_versions.keys():
for line in fileinput.input([target_grml_version_file], inplace=1):
flavour = get_flavour(line)
if flavour in iso_versions.keys():
- print iso_versions
[flavour]
+ print iso_versions
.pop(flavour)
else:
print line.strip()
else:
print line.strip()
+ fileinput.close()
+
+ target_file = open(target_grml_version_file, 'a')
+ # add the new flavours from the current iso
+ for flavour in iso_versions:
+ target_file.write("%s\n" % iso_versions[flavour])
except IOError:
logging.warn("Warning: Could not write file")
finally:
iso_file.close()
except IOError:
logging.warn("Warning: Could not write file")
finally:
iso_file.close()
-
fileinput
.close()
+
target_file
.close()
return True
else:
return False
return True
else:
return False