Branch 'develop' - 4 commits - liveusb-creator liveusb/creator.py liveusb-creator.spec liveusb/gui.py setup.py
Luke Macken
lmacken at fedoraproject.org
Fri Mar 6 21:38:38 UTC 2015
liveusb-creator | 4 ++--
liveusb-creator.spec | 2 +-
liveusb/creator.py | 6 +++---
liveusb/gui.py | 4 ++--
setup.py | 2 +-
5 files changed, 9 insertions(+), 9 deletions(-)
New commits:
commit b6a608af7ea7eb090469d3605b6f8e4a9716dfd4
Merge: 5585fac 9a07f7d
Author: Luke Macken <lmacken at redhat.com>
Date: Fri Mar 6 10:52:41 2015 -0700
Merge branch 'release/3.13.3' into develop
commit 9a07f7d378805a79c3a8bf597f947aaac26f547f
Author: Luke Macken <lmacken at redhat.com>
Date: Fri Mar 6 10:52:19 2015 -0700
Update the copyright
diff --git a/liveusb-creator b/liveusb-creator
index 4945603..ccac468 100755
--- a/liveusb-creator
+++ b/liveusb-creator
@@ -1,7 +1,7 @@
#!/usr/bin/python -tt
# coding: utf-8
#
-# Copyright © 2008-2013 Red Hat, Inc. All rights reserved.
+# Copyright © 2008-2015 Red Hat, Inc. All rights reserved.
#
# This copyrighted material is made available to anyone wishing to use, modify,
# copy, or redistribute it subject to the terms and conditions of the GNU
diff --git a/liveusb/creator.py b/liveusb/creator.py
index 7c9b0df..c031a12 100755
--- a/liveusb/creator.py
+++ b/liveusb/creator.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
#
-# Copyright © 2008-2013 Red Hat, Inc. All rights reserved.
-# Copyright © 2008-2013 Luke Macken <lmacken at redhat.com>
+# Copyright © 2008-2015 Red Hat, Inc. All rights reserved.
+# Copyright © 2008-2015 Luke Macken <lmacken at redhat.com>
#
# This copyrighted material is made available to anyone wishing to use, modify,
# copy, or redistribute it subject to the terms and conditions of the GNU
diff --git a/liveusb/gui.py b/liveusb/gui.py
index 730c70b..cdac8cd 100755
--- a/liveusb/gui.py
+++ b/liveusb/gui.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
#
-# Copyright © 2008-2013 Red Hat, Inc. All rights reserved.
-# Copyright © 2008-2013 Luke Macken <lmacken at redhat.com>
+# Copyright © 2008-2015 Red Hat, Inc. All rights reserved.
+# Copyright © 2008-2015 Luke Macken <lmacken at redhat.com>
# Copyright © 2008 Kushal Das <kushal at fedoraproject.org>
#
# This copyrighted material is made available to anyone wishing to use, modify,
commit 661f884026319982b4818f5481bbbc0d7e938489
Author: Luke Macken <lmacken at redhat.com>
Date: Fri Mar 6 10:52:16 2015 -0700
Bump version to 3.13.3
diff --git a/liveusb-creator b/liveusb-creator
index 4a6cb45..4945603 100755
--- a/liveusb-creator
+++ b/liveusb-creator
@@ -23,7 +23,7 @@ import sys
from liveusb import _
-__version__ = '3.13.2'
+__version__ = '3.13.3'
def parse_args():
from optparse import OptionParser
diff --git a/liveusb-creator.spec b/liveusb-creator.spec
index 2eb90d7..b71ddc4 100644
--- a/liveusb-creator.spec
+++ b/liveusb-creator.spec
@@ -7,7 +7,7 @@
%endif
Name: liveusb-creator
-Version: 3.13.1
+Version: 3.13.3
Release: 1%{?dist}
Summary: A liveusb creator
diff --git a/setup.py b/setup.py
index 5770680..8ea643c 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
from distutils.core import setup
import sys, os
-VERSION = '3.13.2'
+VERSION = '3.13.3'
LOCALE_DIR= '/usr/share/locale'
commit 5585fac011acc35b45dde7ad0e51953ed3972d09
Author: Luke Macken <lmacken at redhat.com>
Date: Fri Feb 27 14:21:21 2015 -0700
Apply patch from #828 to prevent syslinux.cfg LABEL parameters from getting pruned.
Thanks to thisoneguy for the patch.
https://fedorahosted.org/liveusb-creator/ticket/828
diff --git a/liveusb/creator.py b/liveusb/creator.py
index 14f1977..7c9b0df 100755
--- a/liveusb/creator.py
+++ b/liveusb/creator.py
@@ -275,7 +275,7 @@ class LiveUSBCreator(object):
usblabel = 'LABEL=' + self.label
for line in infile.readlines():
if "LABEL" in line:
- line = re.sub("LABEL=[^ ]*", usblabel, line)
+ line = re.sub("LABEL=[^ :]*", usblabel, line)
line = re.sub("rootfstype=[^ ]*",
"rootfstype=%s" % self.fstype,
line)
More information about the liveusb-creator
mailing list