From: Michael Prokop <mika@grml.org>
Date: Sun, 18 Oct 2009 22:48:30 +0000 (+0200)
Subject: Fix merge conflicts
X-Git-Tag: v0.9.13~30
X-Git-Url: https://git.grml.org/?p=grml2usb.git;a=commitdiff_plain;h=abe68338ee0a37eeaccb8dd45c4d9c0b1a18d4ca;hp=579dda2838a24e1b71d11b9041264a8c3ecbbc82

Fix merge conflicts
---

diff --git a/grml2usb b/grml2usb
index 7d67047..b9df22f 100755
--- a/grml2usb
+++ b/grml2usb
@@ -525,7 +525,7 @@ def generate_flavour_specific_syslinux_config(grml_flavour):
 
     return("""\
 menu begin grml %(grml_flavour)s
-    menu title Grml %(grml_flavour)s
+    menu title %(grml_flavour)s
     label mainmenu
     menu label ^Back to main menu...
     menu exit
@@ -1344,7 +1344,18 @@ def adjust_syslinux_bootoptions(src_name, dst_name, flavour):
 
 
 def add_syslinux_entry(filename, grml_flavour):
-    data = open(filename, "a")
+    data = open(filename, "a+")
+    entry_filename = "option-%s.cfg" % grml_flavour
+    entry = "include %s\n" % entry_filename
+    path = os.path.dirname(filename)
+    for line in data:
+        if line == entry:
+            break
+    else:
+        data.write(entry)
+
+    data.close()
+    data = open(path + "/" + entry_filename, "w")
     data.write(generate_flavour_specific_syslinux_config(grml_flavour))
     data.close()
 
@@ -1386,8 +1397,14 @@ def handle_syslinux_config(grml_flavour, target):
 
     new_hidden =  "%s-hidden.cfg" % (grml_flavour)
     new_default = "%s-default.cfg" % (grml_flavour)
-    default_file = open("%s/defaults.cfg" % syslinux_target, "a")
-    default_file.write("include %s\n" % new_default)
+    default_file = open("%s/defaults.cfg" % syslinux_target, "a+")
+    entry = "include %s\n" % new_default
+    for line in default_file:
+        if line == entry:
+            break
+    else:
+        default_file.write("include %s\n" % new_default)
+
     default_file.close()
     add_syslinux_entry("%s/additional.cfg" % syslinux_target, grml_flavour)