[Pkg-privacy-commits] [tails-installer] 06/35: Always refer to the label LIVE instead of the device UUID (#809)

[anonym]

This is an automated email from the git hooks/post-receive script.

anonym-tails-guest pushed a commit to annotated tag 3.12.0
in repository tails-installer.

commit 59fe5dcb2ea11763090eabd3c130241e7c4b2c83
Author: Luke Macken <lmacken at redhat.com>
Date:   Fri Mar 1 11:25:54 2013 -0500

    Always refer to the label LIVE instead of the device UUID (#809)
---
 liveusb/creator.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/liveusb/creator.py b/liveusb/creator.py
index 881c90b..f6bd5e0 100755
--- a/liveusb/creator.py
+++ b/liveusb/creator.py
@@ -271,10 +271,10 @@ class LiveUSBCreator(object):
     def _update_configs(self, infile, outfile):
         infile = file(infile, 'r')
         outfile= file(outfile, 'w')
-        usblabel = self.uuid and 'UUID=' + self.uuid or 'LABEL=' + self.label
+        usblabel = 'LABEL=' + self.label
         for line in infile.readlines():
-            if "CDLABEL" in line:
-                line = re.sub("CDLABEL=[^ ]*", usblabel, line)
+            if "LABEL" in line:
+                line = re.sub("LABEL=[^ ]*", usblabel, line)
                 line = re.sub("rootfstype=[^ ]*",
                               "rootfstype=%s" % self.fstype,
                               line)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/tails-installer.git