[SCM] GUI front-end for Debian Live. branch, master, updated. 50c64561aee327ea479bded28d745adaaee1ebe1
Chris Lamb
chris at chris-lamb.co.uk
Sun Jan 27 01:53:44 UTC 2008
The branch, master has been updated
via 50c64561aee327ea479bded28d745adaaee1ebe1 (commit)
via 93eccdd3167399db714ef28bbab670dff6341a32 (commit)
via 57e64d2d1e899683de8a7abdb68769846eeecfc5 (commit)
via 8b02ef7da15cdbb50ce98a7c0d9a9881a0488784 (commit)
via 6c7c28316ce0f169235364e4a077b2d0ac325596 (commit)
via c0ee8e885d38b870e9b2a18d8210ecb07bb1b0e9 (commit)
via f1be4e09ac6d82a41c2b3f3830e6aeef80b3cb67 (commit)
via 15e704791df08dc67e058b7335bc8cee424016ef (commit)
via 79c1ed0a42302e7f9a0d054eb0691f8ee68da252 (commit)
via dc8ab5bd71a3bea2f98eadc1a3ffd7bb6d772a4f (commit)
via 3f9ca7cb78ede04d78ccda201cc67338592f910b (commit)
via 3661042a303e4c7ff52feb0b707a9e2c532d9630 (commit)
via 78b8553cba740320973019eb9694ce123043bc48 (commit)
via 7bc761cad7e46910e0561f7dc84849d90b576dd1 (commit)
via 3a68a7cc8562472df772eda56c0b2fdb20cd983f (commit)
via c1b0fa620137c6d3b806850c7285b764a945c905 (commit)
via d75986940676c4b41dd6a05cbd35bf7cf4c30677 (commit)
via c3bfe5f5c61845748f349da1710d576729186ecf (commit)
via 315de0aa2ddd7d6d5bb43bbba389e5bd09c05471 (commit)
via 6c2b9bb47a5a75972cd7852bdaa8e739c4d1ad3b (commit)
via 88a7f994ba5450947ba1340d41a05764f4858fd1 (commit)
via 5474273146c526f1247fdf757030d8d0c8bec0dd (commit)
via 0b38b8c0047dc6d95ec86d42fa8b0c92d14474ea (commit)
via c9c6457c224d76f376a6305348abe69f2668c276 (commit)
via ae3ce255c1cf822d1cda982e16d60f328a2cba17 (commit)
via bed13b856937a86b9a45c163ab57c29c66dbdf39 (commit)
via f52bb76cb58aed1083b11f7de5222f9eef4cd41f (commit)
via aa45f4b818556e1d5ed0f9647f8ee6f3d9599f79 (commit)
via e7e7ebfeff6c8599aafc54b5ce56dc2411d1f15a (commit)
via 42c805490e9dde6e2bc7af3e70f54c180edb5127 (commit)
via 52a4e91ee6045efbaa8e80505f7e2884c113c0b4 (commit)
via b214bd47e1e3462244c7abedb6781fa2f3b1d8a5 (commit)
via e1dd8686a3e025ca48c37d619e8a257e1420c56a (commit)
via c97b6737b5587926bfc4b19f237b4a1ea858eb74 (commit)
via 366b8521069a2a87782ef36f18b030afa1818ae5 (commit)
via 3958edf2a3b322f6933f28b9a890e4c577474d08 (commit)
via 8040574dff5777ba132b372b90e7d51bf55493fd (commit)
via 344973b59cafe911760199038208ae4c68a75d6b (commit)
via 7c7f9089ee6f5db3f5a6ee9094c8409123212e5e (commit)
via 5702af714f3a9ce77eb4c8f8ba1abe5aa9c5cd27 (commit)
via 6e38bb4167bc6a1273e5827c2e019193659a2e32 (commit)
via 8f13075f92ec6c8ccec26eb3c8ec50afb2b33a4c (commit)
via c1a253bb8eb9a0eb3e17f19abfcaca714ff81e5b (commit)
via 5d5244146ceccef978718729d88ed788a6bf98ad (commit)
via d4a27a948c45dca59ad3c6900f48cf80c0e31668 (commit)
via ad010a9f083e0e5cf5270f11c35fcfaa1819838b (commit)
from b31041e1c016fdfc5060d40c763344c8246de176 (commit)
- Shortlog ------------------------------------------------------------
50c6456 Use gksu to kill the build (and child) processes.
93eccdd Use SIGTERM instead of SIGKILL.
57e64d2 Display status messages whilst building.
8b02ef7 Save build log to file.
6c7c283 Tidy imports.
c0ee8e8 Bump to Debhelper 6.
f1be4e0 Capitalise "GUI" acronym in package description.
15e7047 Remove python-yaml from live-magic dependencies.
79c1ed0 Rename XS-Vcs-* fields to Vcs-*
dc8ab5b Move to Standards-Version 3.7.3
3f9ca7c Remove python-yaml dependency.
3661042 Rework LiveHelperConfiguration model and associated tests
78b8553 Remove unused tempfile import in LiveHelperConfiguration model.
7bc761c Update tests to reflect model layout.
3a68a7c Update tests so they can be run from different dirs.
c1b0fa6 Snapshot development.
d759869 Update TODO.
c3bfe5f Update TODO.
315de0a Tidy key_var_config_file.
6c2b9bb Fix "strange" file artefacts bug.
88a7f99 Update TODO.
5474273 Display build dir when building.
0b38b8c Don't build in /tmp
c9c6457 Update TODO.
ae3ce25 Simplistic mirror URL guessing.
bed13b8 Use suggested mirror.
f52bb76 Tidy ./live-magic.
aa45f4b Rename LiveMagic.model -> LiveMagic.models.
e7e7ebf Add "Use lh_build error code." to TODO.
42c8054 Rename livemagic/ => LiveMagic/
52a4e91 Add "Don't build in /tmp !" to TODO.
b214bd4 Move to GPLv3.
e1dd868 Fix bug where cancelled build window couldn't be closed.
c97b673 Initial SourcesList model tests.
366b852 Use a different method for spawning lh_build.
3958edf Add constant movement of status bar.
8040574 Fix bug where wizard based builds would traceback on complete.
344973b Update TODO.
7c7f908 Rework TODO.
5702af7 Add simple package handling entry to TODO.
6e38bb4 Update changelog.
8f13075 Remove .dch temporary file.
c1a253b Add new changelog entry.
5d52441 Update TODO.
d4a27a9 Rename LIVE_ -> LH_
ad010a9 Add gitignore.
Summary of changes:
.gitignore | 1 +
COPYING | 895 +++++++++++++++++--------
LiveMagic/controllers/__init__.py | 4 +
LiveMagic/controllers/build.py | 117 ++++
LiveMagic/controllers/hooks.py | 82 +++
LiveMagic/controllers/main.py | 94 +++
LiveMagic/controllers/wizard.py | 32 +
LiveMagic/models/__init__.py | 4 +
LiveMagic/models/folder_of_files.py | 129 ++++
LiveMagic/models/key_var_config_file.py | 203 ++++++
LiveMagic/models/live_helper_configuration.py | 177 +++++
LiveMagic/models/sources_list.py | 45 ++
LiveMagic/views/__init__.py | 4 +
LiveMagic/views/build.py | 61 ++
LiveMagic/views/hooks.py | 180 +++++
LiveMagic/views/main.py | 141 ++++
LiveMagic/views/wizard.py | 78 +++
TODO | 68 ++-
debian/changelog | 7 +
debian/compat | 2 +-
debian/control | 15 +-
debian/copyright | 4 +-
glade/main.glade | 22 +-
live-magic | 36 +-
livemagic/controllers/__init__.py | 4 -
livemagic/controllers/build.py | 75 --
livemagic/controllers/hooks.py | 82 ---
livemagic/controllers/main.py | 95 ---
livemagic/controllers/wizard.py | 23 -
livemagic/model/__init__.py | 3 -
livemagic/model/folder_of_files.py | 128 ----
livemagic/model/key_var_config_file.py | 197 ------
livemagic/model/live_helper_configuration.py | 177 -----
livemagic/views/__init__.py | 4 -
livemagic/views/build.py | 58 --
livemagic/views/hooks.py | 180 -----
livemagic/views/main.py | 141 ----
livemagic/views/wizard.py | 74 --
setup.py | 10 +-
tests/test_folder_of_files.py | 7 +-
tests/test_key_var_config_file.py | 97 ++--
tests/test_live_helper_configuration.py | 34 +-
tests/test_sources_list.py | 75 ++
43 files changed, 2211 insertions(+), 1654 deletions(-)
-----------------------------------------------------------------------
Details of changes:
commit 50c64561aee327ea479bded28d745adaaee1ebe1
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date: Sun Jan 27 01:52:17 2008 +0000
Use gksu to kill the build (and child) processes.
Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
diff --git a/LiveMagic/controllers/build.py b/LiveMagic/controllers/build.py
index 9ecc679..266907d 100644
--- a/LiveMagic/controllers/build.py
+++ b/LiveMagic/controllers/build.py
@@ -4,6 +4,7 @@ import signal
import gobject
import tempfile
import threading
+import commands
class BuildController(object):
@@ -113,4 +114,4 @@ class BuildController(object):
def on_button_build_cancel_clicked(self, *_):
self.cancelled = True
- os.kill(self.pid, signal.SIGTERM)
+ commands.getstatusoutput("gksu /bin/kill -s KILL -%d" % self.pid)
commit 93eccdd3167399db714ef28bbab670dff6341a32
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date: Sun Jan 27 01:25:58 2008 +0000
Use SIGTERM instead of SIGKILL.
Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
diff --git a/LiveMagic/controllers/build.py b/LiveMagic/controllers/build.py
index 286d0f7..9ecc679 100644
--- a/LiveMagic/controllers/build.py
+++ b/LiveMagic/controllers/build.py
@@ -113,4 +113,4 @@ class BuildController(object):
def on_button_build_cancel_clicked(self, *_):
self.cancelled = True
- os.kill(self.pid, signal.SIGKILL)
+ os.kill(self.pid, signal.SIGTERM)
commit 57e64d2d1e899683de8a7abdb68769846eeecfc5
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date: Sun Jan 27 01:25:38 2008 +0000
Display status messages whilst building.
Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
diff --git a/LiveMagic/controllers/build.py b/LiveMagic/controllers/build.py
index e5d5bfc..286d0f7 100644
--- a/LiveMagic/controllers/build.py
+++ b/LiveMagic/controllers/build.py
@@ -1,6 +1,9 @@
import os
+import sys
import signal
import gobject
+import tempfile
+import threading
class BuildController(object):
@@ -15,6 +18,7 @@ class BuildController(object):
def do_show_build_window(self, build_close_callback):
self.cancelled = False
+ self.fifo = None
# Set initial titles and state
self.view.set_build_titles("Generating Debian Live system...", \
@@ -29,8 +33,34 @@ class BuildController(object):
# Start pulsing
gobject.timeout_add(100, self.do_pulse_cb)
+ # Create log FIFO
+ fd, self.fifo = tempfile.mkstemp()
+ os.close(fd)
+ os.unlink(self.fifo)
+ os.mkfifo(self.fifo)
+
+ class BuildLogWatcher(threading.Thread):
+ def run(self):
+ f = None
+ try:
+ f = open(self.controller.fifo, 'r')
+ while not self.controller.cancelled:
+ data = f.readline()
+
+ for prefix in ("I: ", "P: "):
+ if data.startswith(prefix) and not self.controller.cancelled:
+ msg = data[len(prefix):]
+ gobject.timeout_add(0, lambda: self.controller.view.set_build_status(msg))
+ finally:
+ if f:
+ f.close()
+
+ b = BuildLogWatcher()
+ b.controller = self
+ b.start()
+
# Fork command
- cmd = ['/usr/bin/gksu', '-k', "/bin/sh -c 'echo I: lh_build starting in `pwd`; lh_build 2>&1 | tee --append build-log.txt; echo I: lh_build returned with error code $?'"]
+ cmd = ['/usr/bin/gksu', '-k', "/bin/sh -c '{ echo I: lh_build starting in `pwd`; lh_build 2>&1; echo I: lh_build returned with error code $?; } | tee build-log.txt %s; '" % self.fifo]
self.pid = self.view.vte_terminal.fork_command(cmd[0], cmd, None, self.model.dir)
if self.pid >= 0:
@@ -52,6 +82,10 @@ class BuildController(object):
def on_vte_child_exited(self, *_):
self.pid = -1
+ # Remove fifo
+ if self.fifo:
+ os.unlink(self.fifo)
+
if self.view.get_build_auto_close():
self.view.do_hide_window_build()
else:
diff --git a/TODO b/TODO
index 7f901b0..f6e4116 100644
--- a/TODO
+++ b/TODO
@@ -7,8 +7,6 @@ General
Build/build window
- * Better status readouts (needs live-helper patching)
-
* Interactive build - either support it (how?) or flag a warning if it is enabled.
-- Debconf 'NONINTERACTIVE'
diff --git a/live-magic b/live-magic
index b43ac65..8ca04f9 100755
--- a/live-magic
+++ b/live-magic
@@ -58,4 +58,5 @@ if __name__ == "__main__":
v = View(c)
c.ready()
+ gtk.gdk.threads_init()
gtk.main()
commit 8b02ef7da15cdbb50ce98a7c0d9a9881a0488784
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date: Sat Jan 26 22:57:33 2008 +0000
Save build log to file.
Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
diff --git a/LiveMagic/controllers/build.py b/LiveMagic/controllers/build.py
index 66d726d..e5d5bfc 100644
--- a/LiveMagic/controllers/build.py
+++ b/LiveMagic/controllers/build.py
@@ -30,7 +30,7 @@ class BuildController(object):
gobject.timeout_add(100, self.do_pulse_cb)
# Fork command
- cmd = ['/usr/bin/gksu', '-k', "/bin/sh -c 'sleep 0.5; exit 1; echo I: lh_build starting in `pwd`; lh_build 2>&1; echo I: lh_build returned with error code $?'"]
+ cmd = ['/usr/bin/gksu', '-k', "/bin/sh -c 'echo I: lh_build starting in `pwd`; lh_build 2>&1 | tee --append build-log.txt; echo I: lh_build returned with error code $?'"]
self.pid = self.view.vte_terminal.fork_command(cmd[0], cmd, None, self.model.dir)
if self.pid >= 0:
diff --git a/TODO b/TODO
index 72bc364..7f901b0 100644
--- a/TODO
+++ b/TODO
@@ -16,8 +16,6 @@ Build/build window
* Make ProgressBar full-width when finished.
- * Save build log to file.
-
* Choose distribution to build. Add notice re. broken testing/unstable builds.
Wizard
commit 6c7c28316ce0f169235364e4a077b2d0ac325596
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date: Sat Jan 26 22:49:35 2008 +0000
Tidy imports.
Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
diff --git a/LiveMagic/models/folder_of_files.py b/LiveMagic/models/folder_of_files.py
index af4f252..0747821 100644
--- a/LiveMagic/models/folder_of_files.py
+++ b/LiveMagic/models/folder_of_files.py
@@ -1,5 +1,6 @@
import glob
import os
+
from os.path import join
class FolderOfFiles(object):
diff --git a/LiveMagic/models/live_helper_configuration.py b/LiveMagic/models/live_helper_configuration.py
index cb479af..6a421d9 100644
--- a/LiveMagic/models/live_helper_configuration.py
+++ b/LiveMagic/models/live_helper_configuration.py
@@ -1,9 +1,6 @@
+import os
import commands
import time
-import tempfile
-
-from os.path import join, dirname, expanduser
-import os
from key_var_config_file import KeyVarConfigFile
from folder_of_files import FolderOfFiles
@@ -104,7 +101,7 @@ class LiveHelperConfiguration(object):
def __init__(self, dir=None):
if dir is None:
- dir = expanduser("~/DebianLive/%s" % time.strftime('%Y-%m-%d-%H%M%S'))
+ dir = os.path.expanduser("~/DebianLive/%s" % time.strftime('%Y-%m-%d-%H%M%S'))
self.dir = dir
self.children = []
@@ -156,12 +153,12 @@ class LiveHelperConfiguration(object):
self.children = []
for filename, file_spec in CONFIG_SPEC['key_value'].iteritems():
- kv = KeyVarConfigFile(join(self.dir, 'config', filename), file_spec)
+ kv = KeyVarConfigFile(os.path.join(self.dir, 'config', filename), file_spec)
self.children.append(kv)
setattr(self, filename, kv)
for name, dir in CONFIG_SPEC['folder_of_files'].iteritems():
- fof = FolderOfFiles(join(self.dir, 'config', dir))
+ fof = FolderOfFiles(os.path.join(self.dir, 'config', dir))
setattr(self, name, fof)
self.children.append(fof)
commit c0ee8e885d38b870e9b2a18d8210ecb07bb1b0e9
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date: Sat Jan 26 22:45:02 2008 +0000
Bump to Debhelper 6.
Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..1e8b314 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+6
diff --git a/debian/control b/debian/control
index 4a416c6..bc59066 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: misc
Priority: optional
Maintainer: Debian Live <debian-live-maint at lists.alioth.debian.org>
Uploaders: Chris Lamb <chris at chris-lamb.co.uk>, Daniel Baumann <daniel at debian.org>
-Build-Depends: debhelper (>= 5), cdbs, python-dev, python-support, live-helper
+Build-Depends: debhelper (>= 6), cdbs, python-dev, python-support, live-helper
Standards-Version: 3.7.3
Homepage: http://debian-live.alioth.debian.org/
Vcs-Git: git://git.debian.org/git/users/lamby-guest/live-magic.git
commit f1be4e09ac6d82a41c2b3f3830e6aeef80b3cb67
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date: Sat Jan 26 22:44:27 2008 +0000
Capitalise "GUI" acronym in package description.
Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
diff --git a/debian/control b/debian/control
index 91f3851..4a416c6 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Package: live-magic
Architecture: all
Depends: live-helper, python-glade2 (>= 2.10), python-gtk2, python-vte, ${python:Depends}
Recommends: python-gnome2-desktop
-Description: Debian Live helper programs (gui frontend)
+Description: Debian Live helper programs (GUI frontend)
Live-helper is a collection of programs that can be used to build Debian Live
system images. The philosophy behind live-helper is to provide a collection of
small, simple, and easily understood tools that can be used in your own program
@@ -22,4 +22,4 @@ Description: Debian Live helper programs (gui frontend)
A typical program that uses live-helper will call several live-helper commands
in sequence. Live-helper commands are all named with a "lh_" prefix.
.
- This package contains the gui frontend.
+ This package contains the GUI frontend.
commit 15e704791df08dc67e058b7335bc8cee424016ef
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date: Sat Jan 26 22:43:42 2008 +0000
Remove python-yaml from live-magic dependencies.
Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
diff --git a/debian/control b/debian/control
index 94d9e31..91f3851 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Vcs-Browser: http://git.debian.org/?p=users/lamby-guest/live-magic.git
Package: live-magic
Architecture: all
-Depends: live-helper, python-glade2 (>= 2.10), python-gtk2, python-vte, python-yaml, ${python:Depends}
+Depends: live-helper, python-glade2 (>= 2.10), python-gtk2, python-vte, ${python:Depends}
Recommends: python-gnome2-desktop
Description: Debian Live helper programs (gui frontend)
Live-helper is a collection of programs that can be used to build Debian Live
commit 79c1ed0a42302e7f9a0d054eb0691f8ee68da252
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date: Sat Jan 26 22:43:11 2008 +0000
Rename XS-Vcs-* fields to Vcs-*
Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
diff --git a/debian/control b/debian/control
index bd436cb..94d9e31 100644
--- a/debian/control
+++ b/debian/control
@@ -6,9 +6,8 @@ Uploaders: Chris Lamb <chris at chris-lamb.co.uk>, Daniel Baumann <daniel at debian.or
Build-Depends: debhelper (>= 5), cdbs, python-dev, python-support, live-helper
Standards-Version: 3.7.3
Homepage: http://debian-live.alioth.debian.org/
-XS-Upstream-Depends: git-core
-XS-Vcs-Git: git://git.debian.org/git/users/lamby-guest/live-magic.git
-XS-Vcs-Browser: http://git.debian.org/?p=users/lamby-guest/live-magic.git
+Vcs-Git: git://git.debian.org/git/users/lamby-guest/live-magic.git
+Vcs-Browser: http://git.debian.org/?p=users/lamby-guest/live-magic.git
Package: live-magic
Architecture: all
commit dc8ab5bd71a3bea2f98eadc1a3ffd7bb6d772a4f
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date: Sat Jan 26 22:42:52 2008 +0000
Move to Standards-Version 3.7.3
Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
diff --git a/debian/control b/debian/control
index 57bfe66..bd436cb 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian Live <debian-live-maint at lists.alioth.debian.org>
Uploaders: Chris Lamb <chris at chris-lamb.co.uk>, Daniel Baumann <daniel at debian.org>
Build-Depends: debhelper (>= 5), cdbs, python-dev, python-support, live-helper
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
Homepage: http://debian-live.alioth.debian.org/
XS-Upstream-Depends: git-core
XS-Vcs-Git: git://git.debian.org/git/users/lamby-guest/live-magic.git
commit 3f9ca7cb78ede04d78ccda201cc67338592f910b
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date: Sat Jan 26 22:42:17 2008 +0000
Remove python-yaml dependency.
Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
diff --git a/LiveMagic/models/live_helper_configuration.py b/LiveMagic/models/live_helper_configuration.py
index 76b7d41..cb479af 100644
--- a/LiveMagic/models/live_helper_configuration.py
+++ b/LiveMagic/models/live_helper_configuration.py
@@ -1,5 +1,4 @@
import commands
-import yaml
import time
import tempfile
@@ -9,93 +8,94 @@ import os
from key_var_config_file import KeyVarConfigFile
from folder_of_files import FolderOfFiles
-spec_str = """
-key_value:
- common:
- LH_APT : string
- LH_APT_FTPPROXY : string
- LH_APT_HTTPPROXY : string
- LH_APT_PDIFFS : boolean
- LH_APT_PIPELINE : int
- LH_APT_RECOMMENDS : boolean
- LH_APT_SECURE : boolean
- LH_BOOTSTRAP : string
- LH_CACHE_INDICES : boolean
- LH_CACHE_PACKAGES : boolean
- LH_CACHE_STAGES : list
- LH_DEBCONF_FRONTEND : string
- LH_DEBCONF_NOWARNINGS : boolean
- LH_DEBCONF_PRIORITY : string
- LH_GENISOIMAGE : string
- LH_INITRAMFS : string
- LH_LOSETUP : string
- LH_MODE : string
- LH_ROOT_COMMAND : string
- LH_TASKSEL : string
- LH_ROOT : string
- LH_INCLUDES : string
- LH_TEMPLATES : string
- LH_BREAKPOINTS : boolean
- LH_DEBUG : boolean
- LH_FORCE : boolean
- LH_QUIET : boolean
- LH_VERBOSE : boolean
-
- bootstrap:
- LH_ARCHITECTURE : list
- LH_BOOTSTRAP_CONFIG : string
- LH_BOOTSTRAP_FLAVOUR : string
- LH_BOOTSTRAP_KEYRING : string
- LH_DISTRIBUTION : string
- LH_MIRROR_BOOTSTRAP : string
- LH_MIRROR_BOOTSTRAP_SECURITY : string
- LH_MIRROR_BINARY : string
- LH_MIRROR_BINARY_SECURITY : string
- LH_SECTIONS : list
-
- chroot:
- LH_CHROOT_FILESYSTEM : string
- LH_UNION_FILESYSTEM : string
- LH_HOOKS : list
- LH_INTERACTIVE : boolean
- LH_KEYRING_PACKAGES : list
- LH_LANGUAGE : string
- LH_LINUX_FLAVOURS : list
- LH_LINUX_PACKAGES : list
- LH_PACKAGES : list
- LH_PACKAGES_LISTS : string
- LH_PRESEED : string
- LH_TASKS : list
- LH_SECURITY : boolean
- LH_SYMLINKS : boolean
- LH_SYSVINIT : boolean
-
- binary:
- LH_BINARY_IMAGES : string
- LH_BINARY_INDICES : boolean
- LH_BOOTAPPEND : string
- LH_BOOTLOADER : string
- LH_DEBIAN_INSTALLER : boolean
- LH_ENCRYPTION : string
- LH_GRUB_SPLASH : string
- LH_HOSTNAME : string
- LH_ISO_APPLICATION : string
- LH_ISO_PREPARER : string
- LH_ISO_PUBLISHER : string
- LH_ISO_VOLUME : string
- LH_MEMTEST : string
- LH_NET_PATH : string
- LH_NET_SERVER : string
- LH_SYSLINUX_SPLASH : string
- LH_USERNAME : string
-
- source:
- LH_SOURCE : boolean
- LH_SOURCE_IMAGES : list
-
-folder_of_files:
- chroot_local-hooks
-"""
+CONFIG_SPEC = {
+ 'folder_of_files': {
+ 'hooks': 'chroot_local-hooks',
+ },
+ 'key_value': {
+ 'binary': {
+ 'LH_BINARY_IMAGES': 'string',
+ 'LH_BINARY_INDICES': 'boolean',
+ 'LH_BOOTAPPEND': 'string',
+ 'LH_BOOTLOADER': 'string',
+ 'LH_DEBIAN_INSTALLER': 'boolean',
+ 'LH_ENCRYPTION': 'string',
+ 'LH_GRUB_SPLASH': 'string',
+ 'LH_HOSTNAME': 'string',
+ 'LH_ISO_APPLICATION': 'string',
+ 'LH_ISO_PREPARER': 'string',
+ 'LH_ISO_PUBLISHER': 'string',
+ 'LH_ISO_VOLUME': 'string',
+ 'LH_MEMTEST': 'string',
+ 'LH_NET_PATH': 'string',
+ 'LH_NET_SERVER': 'string',
+ 'LH_SYSLINUX_SPLASH': 'string',
+ 'LH_USERNAME': 'string',
+ },
+ 'bootstrap': {
+ 'LH_ARCHITECTURE': 'list',
+ 'LH_BOOTSTRAP_CONFIG': 'string',
+ 'LH_BOOTSTRAP_FLAVOUR': 'string',
+ 'LH_BOOTSTRAP_KEYRING': 'string',
+ 'LH_DISTRIBUTION': 'string',
+ 'LH_MIRROR_BINARY': 'string',
+ 'LH_MIRROR_BINARY_SECURITY': 'string',
+ 'LH_MIRROR_BOOTSTRAP': 'string',
+ 'LH_MIRROR_BOOTSTRAP_SECURITY': 'string',
+ 'LH_SECTIONS': 'list',
+ },
+ 'chroot': {
+ 'LH_CHROOT_FILESYSTEM': 'string',
+ 'LH_HOOKS': 'list',
+ 'LH_INTERACTIVE': 'boolean',
+ 'LH_KEYRING_PACKAGES': 'list',
+ 'LH_LANGUAGE': 'string',
+ 'LH_LINUX_FLAVOURS': 'list',
+ 'LH_LINUX_PACKAGES': 'list',
+ 'LH_PACKAGES': 'list',
+ 'LH_PACKAGES_LISTS': 'string',
+ 'LH_PRESEED': 'string',
+ 'LH_SECURITY': 'boolean',
+ 'LH_SYMLINKS': 'boolean',
+ 'LH_SYSVINIT': 'boolean',
+ 'LH_TASKS': 'list',
+ 'LH_UNION_FILESYSTEM': 'string',
+ },
+ 'common': {
+ 'LH_APT': 'string',
+ 'LH_APT_FTPPROXY': 'string',
+ 'LH_APT_HTTPPROXY': 'string',
+ 'LH_APT_PDIFFS': 'boolean',
+ 'LH_APT_PIPELINE': 'int',
+ 'LH_APT_RECOMMENDS': 'boolean',
+ 'LH_APT_SECURE': 'boolean',
+ 'LH_BOOTSTRAP': 'string',
+ 'LH_BREAKPOINTS': 'boolean',
+ 'LH_CACHE_INDICES': 'boolean',
+ 'LH_CACHE_PACKAGES': 'boolean',
+ 'LH_CACHE_STAGES': 'list',
+ 'LH_DEBCONF_FRONTEND': 'string',
+ 'LH_DEBCONF_NOWARNINGS': 'boolean',
+ 'LH_DEBCONF_PRIORITY': 'string',
+ 'LH_DEBUG': 'boolean',
+ 'LH_FORCE': 'boolean',
+ 'LH_GENISOIMAGE': 'string',
+ 'LH_INCLUDES': 'string',
+ 'LH_INITRAMFS': 'string',
+ 'LH_LOSETUP': 'string',
+ 'LH_MODE': 'string',
+ 'LH_QUIET': 'boolean',
+ 'LH_ROOT': 'string',
+ 'LH_ROOT_COMMAND': 'string',
+ 'LH_TASKSEL': 'string',
+ 'LH_TEMPLATES': 'string',
+ 'LH_VERBOSE': 'boolean',
+ },
+ 'source': {
+ 'LH_SOURCE': 'boolean', 'LH_SOURCE_IMAGES': 'list',
+ }
+ }
+}
class LiveHelperConfiguration(object):
"""
@@ -110,7 +110,6 @@ class LiveHelperConfiguration(object):
self.children = []
self._load_observers = []
self.first_load = True
- self.spec = yaml.load(spec_str)
def new(self, tempdir=None):
"""
@@ -155,15 +154,16 @@ class LiveHelperConfiguration(object):
def _load(self):
self.children = []
- for filename, spec in self.spec['key_value'].iteritems():
- kv = KeyVarConfigFile(join(self.dir, 'config', filename), spec)
+
+ for filename, file_spec in CONFIG_SPEC['key_value'].iteritems():
+ kv = KeyVarConfigFile(join(self.dir, 'config', filename), file_spec)
self.children.append(kv)
setattr(self, filename, kv)
- # chroot_local-hooks
- fof_hooks = FolderOfFiles(join(self.dir, 'config', 'chroot_local-hooks'))
- setattr(self, 'hooks', fof_hooks)
- self.children.append(fof_hooks)
+ for name, dir in CONFIG_SPEC['folder_of_files'].iteritems():
+ fof = FolderOfFiles(join(self.dir, 'config', dir))
+ setattr(self, name, fof)
+ self.children.append(fof)
# Notify all the observers, but avoid double load when the view is ready
if not self.first_load:
diff --git a/TODO b/TODO
index e750da0..72bc364 100644
--- a/TODO
+++ b/TODO
@@ -5,8 +5,6 @@ General
* Fix about box close dialog problem.
- * Remove python-yaml dependency.
-
Build/build window
* Better status readouts (needs live-helper patching)
diff --git a/debian/control b/debian/control
index 4c3ef9f..57bfe66 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: misc
Priority: optional
Maintainer: Debian Live <debian-live-maint at lists.alioth.debian.org>
Uploaders: Chris Lamb <chris at chris-lamb.co.uk>, Daniel Baumann <daniel at debian.org>
-Build-Depends: debhelper (>= 5), cdbs, python-dev, python-support, python-yaml, live-helper
+Build-Depends: debhelper (>= 5), cdbs, python-dev, python-support, live-helper
Standards-Version: 3.7.2
Homepage: http://debian-live.alioth.debian.org/
XS-Upstream-Depends: git-core
commit 3661042a303e4c7ff52feb0b707a9e2c532d9630
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date: Sat Jan 26 22:27:52 2008 +0000
Rework LiveHelperConfiguration model and associated tests
Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
diff --git a/LiveMagic/models/live_helper_configuration.py b/LiveMagic/models/live_helper_configuration.py
index 51be917..76b7d41 100644
--- a/LiveMagic/models/live_helper_configuration.py
+++ b/LiveMagic/models/live_helper_configuration.py
@@ -1,6 +1,7 @@
import commands
import yaml
import time
+import tempfile
from os.path import join, dirname, expanduser
import os
@@ -102,30 +103,32 @@ class LiveHelperConfiguration(object):
"""
def __init__(self, dir=None):
+ if dir is None:
+ dir = expanduser("~/DebianLive/%s" % time.strftime('%Y-%m-%d-%H%M%S'))
self.dir = dir
- self.children = []
+ self.children = []
self._load_observers = []
self.first_load = True
self.spec = yaml.load(spec_str)
- def new(self):
+ def new(self, tempdir=None):
"""
Creates and initialises a new configuration in a temporary folder.
"""
-
- self.dir = expanduser("~/DebianLive/%s" % time.strftime('%Y-%m-%d-%H%M%S'))
- os.makedirs(self.dir)
+ if not os.path.exists(self.dir):
+ os.makedirs(self.dir)
res, out = commands.getstatusoutput('cd %s; lh_config' % self.dir)
if res != 0: raise IOError, out
self._load()
- def open(self):
+ def open(self, dir):
"""
Discards the current configuration, and then loads and initialises
the configuration from the specified directory.
"""
+ self.dir = dir
self._load()
def reload(self):
diff --git a/tests/test_live_helper_configuration.py b/tests/test_live_helper_configuration.py
index 101dbde..432e770 100755
--- a/tests/test_live_helper_configuration.py
+++ b/tests/test_live_helper_configuration.py
@@ -11,7 +11,9 @@ from LiveMagic import models
class TestConfiguration(unittest.TestCase):
def setUp(self):
- self.conf = models.LiveHelperConfiguration(None)
+ self.dir = tempfile.mkdtemp()
+ self.conf = models.LiveHelperConfiguration(self.dir)
+ self.conf.new()
def testSimpleSetup(self):
"""
@@ -29,9 +31,10 @@ class TestConfiguration(unittest.TestCase):
"""
self.conf.common.LH_SPAM = "eggs"
self.conf.save()
+
saved_dir = self.conf.dir
- self.conf.new()
+ self.setUp()
assert not hasattr(self.conf.common, 'LH_SPAM')
self.conf.open(saved_dir)
commit 78b8553cba740320973019eb9694ce123043bc48
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date: Sat Jan 26 22:09:06 2008 +0000
Remove unused tempfile import in LiveHelperConfiguration model.
Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
diff --git a/LiveMagic/models/live_helper_configuration.py b/LiveMagic/models/live_helper_configuration.py
index 48b9e00..51be917 100644
--- a/LiveMagic/models/live_helper_configuration.py
+++ b/LiveMagic/models/live_helper_configuration.py
@@ -1,5 +1,4 @@
import commands
-import tempfile
import yaml
import time
commit 7bc761cad7e46910e0561f7dc84849d90b576dd1
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date: Sat Jan 26 21:51:26 2008 +0000
Update tests to reflect model layout.
Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
diff --git a/tests/test_folder_of_files.py b/tests/test_folder_of_files.py
index aa8a7b2..b883e47 100755
--- a/tests/test_folder_of_files.py
+++ b/tests/test_folder_of_files.py
@@ -7,12 +7,12 @@ import os
import sys
sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-from LiveMagic import model
+from LiveMagic import models
class TestFolderOfFiles(unittest.TestCase):
def setUp(self):
self.dir = tempfile.mkdtemp('live-magic')
- self.fof = model.FolderOfFiles(self.dir)
+ self.fof = models.FolderOfFiles(self.dir)
def f_c(self, filename):
return open("%s/%s" % (self.dir, filename), 'r').read()
diff --git a/tests/test_key_var_config_file.py b/tests/test_key_var_config_file.py
index 9dd167e..ab25510 100755
--- a/tests/test_key_var_config_file.py
+++ b/tests/test_key_var_config_file.py
@@ -7,7 +7,7 @@ import os
import sys
sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-from LiveMagic import model
+from LiveMagic import models
class TestKeyVarConfigFile(unittest.TestCase):
def setUp(self):
@@ -19,7 +19,7 @@ class TestKeyVarConfigFile(unittest.TestCase):
'LH_SPAMLIST' : 'list',
'LH_SPAMBOOL' : 'boolean',
}
- self.keyvar = model.KeyVarConfigFile(self.filename, spec)
+ self.keyvar = models.KeyVarConfigFile(self.filename, spec)
def f_c(self, filename=None):
if filename is None: filename = self.filename
diff --git a/tests/test_live_helper_configuration.py b/tests/test_live_helper_configuration.py
index 1e8a17a..101dbde 100755
--- a/tests/test_live_helper_configuration.py
+++ b/tests/test_live_helper_configuration.py
@@ -7,11 +7,11 @@ import os
import sys
sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-from LiveMagic import model
+from LiveMagic import models
class TestConfiguration(unittest.TestCase):
def setUp(self):
- self.conf = model.LiveHelperConfiguration(None)
+ self.conf = models.LiveHelperConfiguration(None)
def testSimpleSetup(self):
"""
commit 3a68a7cc8562472df772eda56c0b2fdb20cd983f
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date: Sat Jan 26 21:46:11 2008 +0000
Update tests so they can be run from different dirs.
Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
diff --git a/tests/test_folder_of_files.py b/tests/test_folder_of_files.py
index 66464d8..aa8a7b2 100755
--- a/tests/test_folder_of_files.py
+++ b/tests/test_folder_of_files.py
@@ -5,7 +5,8 @@ import tempfile
import os
import sys
-sys.path.append('..')
+sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+
from LiveMagic import model
class TestFolderOfFiles(unittest.TestCase):
diff --git a/tests/test_key_var_config_file.py b/tests/test_key_var_config_file.py
index 527080b..9dd167e 100755
--- a/tests/test_key_var_config_file.py
+++ b/tests/test_key_var_config_file.py
@@ -5,7 +5,8 @@ import tempfile
import os
import sys
-sys.path.append('..')
+sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+
from LiveMagic import model
class TestKeyVarConfigFile(unittest.TestCase):
diff --git a/tests/test_live_helper_configuration.py b/tests/test_live_helper_configuration.py
index 02db9c3..1e8a17a 100755
--- a/tests/test_live_helper_configuration.py
+++ b/tests/test_live_helper_configuration.py
@@ -5,7 +5,8 @@ import tempfile
import os
import sys
-sys.path.append('..')
+sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+
from LiveMagic import model
class TestConfiguration(unittest.TestCase):
diff --git a/tests/test_sources_list.py b/tests/test_sources_list.py
index f0bb208..44cdfd6 100755
--- a/tests/test_sources_list.py
+++ b/tests/test_sources_list.py
@@ -5,7 +5,8 @@ import tempfile
import os
import sys
-sys.path.append('..')
+sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+
from LiveMagic import models
class TestSourcesList(unittest.TestCase):
commit c1b0fa620137c6d3b806850c7285b764a945c905
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date: Fri Jan 25 22:44:10 2008 +0000
Snapshot development.
diff --git a/LiveMagic/controllers/build.py b/LiveMagic/controllers/build.py
index 43ac663..66d726d 100644
--- a/LiveMagic/controllers/build.py
+++ b/LiveMagic/controllers/build.py
@@ -30,7 +30,7 @@ class BuildController(object):
gobject.timeout_add(100, self.do_pulse_cb)
# Fork command
- cmd = ['/usr/bin/gksu', '-k', "/bin/sh -c 'sleep 0.5; echo I: lh_build starting in `pwd`; lh_build 2>&1; echo I: lh_build returned with error code $?'"]
+ cmd = ['/usr/bin/gksu', '-k', "/bin/sh -c 'sleep 0.5; exit 1; echo I: lh_build starting in `pwd`; lh_build 2>&1; echo I: lh_build returned with error code $?'"]
self.pid = self.view.vte_terminal.fork_command(cmd[0], cmd, None, self.model.dir)
if self.pid >= 0:
@@ -41,6 +41,8 @@ class BuildController(object):
# Allow user to close window
self.view.set_build_status_change(initial=False)
+ self.view.do_build_completed()
+
def on_window_build_delete_event(self, *_):
# If no command is running, close the window
if self.pid < 0:
diff --git a/LiveMagic/controllers/main.py b/LiveMagic/controllers/main.py
index 493daba..1f6e73d 100644
--- a/LiveMagic/controllers/main.py
+++ b/LiveMagic/controllers/main.py
@@ -22,12 +22,11 @@ class MainController(object):
self.view.setup_sections(sections)
# Notify all the observers that depend on the model
- self.model.notify_load_observers()
-
if len(self.args) == 0:
self.view.do_show_wizard()
else:
self.view.do_show_main_window()
+ self.model.notify_load_observers()
# GTK callbacks
def on_live_helper_value_changed(self, widget):
diff --git a/LiveMagic/controllers/wizard.py b/LiveMagic/controllers/wizard.py
index a606989..2731a7f 100644
--- a/LiveMagic/controllers/wizard.py
+++ b/LiveMagic/controllers/wizard.py
@@ -8,6 +8,8 @@ class WizardController(object):
# Fill in data from model
data = self.view.get_wizard_completed_details()
+
+ self.model.new()
self.model.binary.LH_BINARY_IMAGES = [data['media']]
self.model.bootstrap.LH_MIRROR_BOOTSTRAP = data['mirror']
self.model.chroot.LH_PACKAGES_LISTS = data['desktop']
diff --git a/LiveMagic/models/live_helper_configuration.py b/LiveMagic/models/live_helper_configuration.py
index 245f837..48b9e00 100644
--- a/LiveMagic/models/live_helper_configuration.py
+++ b/LiveMagic/models/live_helper_configuration.py
@@ -102,17 +102,14 @@ class LiveHelperConfiguration(object):
Represents a configuration for a Debian Live system.
"""
- def __init__(self, confdir=None):
+ def __init__(self, dir=None):
+ self.dir = dir
+ self.children = []
+
self._load_observers = []
self.first_load = True
-
self.spec = yaml.load(spec_str)
- if confdir is None:
- self.new()
- else:
- self.open(dir)
-
def new(self):
"""
Creates and initialises a new configuration in a temporary folder.
@@ -125,12 +122,11 @@ class LiveHelperConfiguration(object):
if res != 0: raise IOError, out
self._load()
- def open(self, dir):
+ def open(self):
"""
Discards the current configuration, and then loads and initialises
the configuration from the specified directory.
"""
- self.dir = dir
self._load()
def reload(self):
diff --git a/LiveMagic/views/build.py b/LiveMagic/views/build.py
index f9c3ef9..3b3871d 100644
--- a/LiveMagic/views/build.py
+++ b/LiveMagic/views/build.py
@@ -1,4 +1,5 @@
import vte
+import gtk
class BuildView(object):
def __init__(self):
@@ -55,3 +56,6 @@ class BuildView(object):
build, and False otherwise.
"""
return self['checkbutton_build_auto_close'].get_active()
+
+ def do_build_completed(self):
+ self['progress_build'].set_fraction(0.5)
commit d75986940676c4b41dd6a05cbd35bf7cf4c30677
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date: Thu Jan 24 20:03:36 2008 +0000
Update TODO.
Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
diff --git a/TODO b/TODO
index 71a68cd..e750da0 100644
--- a/TODO
+++ b/TODO
@@ -20,6 +20,8 @@ Build/build window
* Save build log to file.
+ * Choose distribution to build. Add notice re. broken testing/unstable builds.
+
Wizard
* Don't create config dir until end of wizard.
@@ -35,8 +37,8 @@ Wizard
* Pressing 'ENTER' on fields moves to next page.
- * Only ask architecture question on amd64.
-
+ * Only ask architecture question on amd64?
+
Expert mode
* File selectors (preseed, splash screen) (gtk.Entry with 'Select' button)
commit c3bfe5f5c61845748f349da1710d576729186ecf
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date: Sun Jan 20 17:00:23 2008 +0000
Update TODO.
Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
diff --git a/TODO b/TODO
index 810c878..71a68cd 100644
--- a/TODO
+++ b/TODO
@@ -16,10 +16,16 @@ Build/build window
* Use lh_build error code, both for status of build and status of password entry.
+ * Make ProgressBar full-width when finished.
+
+ * Save build log to file.
+
Wizard
* Don't create config dir until end of wizard.
+ * After successful build, purge cache etc. and open
+
* Add simple package handling to wizard.
* Remove maximise option.
commit 315de0aa2ddd7d6d5bb43bbba389e5bd09c05471
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date: Sun Jan 20 16:51:21 2008 +0000
Tidy key_var_config_file.
Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
diff --git a/LiveMagic/models/key_var_config_file.py b/LiveMagic/models/key_var_config_file.py
index 8b0c08a..01f5dff 100644
--- a/LiveMagic/models/key_var_config_file.py
+++ b/LiveMagic/models/key_var_config_file.py
@@ -105,46 +105,48 @@ class KeyVarConfigFile(object):
"""
Update all updated entries in the file.
"""
- if len(self._stale) > 0:
- f = open(self.filename, 'r+')
- lines = f.readlines()
-
- for k in self._stale:
- val = getattr(self, k)
-
- # Escape value
- if type(val) in (list, list_observer):
- for from_, to in self.escapes:
- val = map(lambda x: x.replace(from_, to), val)
- val = map(str.strip, val)
- elif type(val) is str:
- for from_, to in self.escapes:
- val = val.replace(from_, to)
-
- # Format value depending on its type
- line_value = {
- list : lambda v: " ".join(val),
- bool : lambda v: {True: 'enabled', False: 'disabled'}.get(val, None),
- str : lambda v: v,
- type(None) : lambda v: "",
- }[type(val)](val)
-
- line = '%s="%s"\n' % (k, line_value)
-
- try:
- # Overwrite original line in file
- lines[self._line_numbers[k] - 1] = line
- except KeyError:
- # Append line to end of file
- lines.append("\n# The following option was added by live-magic\n")
- lines.append(line)
- f.close()
-
- f = open(self.filename, 'w')
- f.writelines(lines)
- f.close()
-
- self._stale.clear()
+ if len(self._stale) == 0:
+ return
+
+ f = open(self.filename, 'r+')
+ lines = f.readlines()
+
+ for k in self._stale:
+ val = getattr(self, k)
+
+ # Escape value
+ if type(val) in (list, list_observer):
+ for from_, to in self.escapes:
+ val = map(lambda x: x.replace(from_, to), val)
+ val = map(str.strip, val)
+ elif type(val) is str:
+ for from_, to in self.escapes:
+ val = val.replace(from_, to)
+
+ # Format value depending on its type
+ line_value = {
+ list : lambda v: " ".join(val),
+ bool : lambda v: {True: 'enabled', False: 'disabled'}.get(val, None),
+ str : lambda v: v,
+ type(None) : lambda v: "",
+ }[type(val)](val)
+
+ line = '%s="%s"\n' % (k, line_value)
+
+ try:
+ # Overwrite original line in file
+ lines[self._line_numbers[k] - 1] = line
+ except KeyError:
+ # Append line to end of file
+ lines.append("\n# The following option was added by live-magic\n")
+ lines.append(line)
+ f.close()
+
+ f = open(self.filename, 'w')
+ f.writelines(lines)
+ f.close()
+
+ self._stale.clear()
class list_observer(list):
commit 6c2b9bb47a5a75972cd7852bdaa8e739c4d1ad3b
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date: Sun Jan 20 16:45:27 2008 +0000
Fix "strange" file artefacts bug.
Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
diff --git a/LiveMagic/models/key_var_config_file.py b/LiveMagic/models/key_var_config_file.py
index 53f3409..8b0c08a 100644
--- a/LiveMagic/models/key_var_config_file.py
+++ b/LiveMagic/models/key_var_config_file.py
@@ -138,8 +138,12 @@ class KeyVarConfigFile(object):
# Append line to end of file
lines.append("\n# The following option was added by live-magic\n")
lines.append(line)
- f.seek(0)
+ f.close()
+
+ f = open(self.filename, 'w')
f.writelines(lines)
+ f.close()
+
self._stale.clear()
commit 88a7f994ba5450947ba1340d41a05764f4858fd1
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date: Sun Jan 20 16:37:57 2008 +0000
Update TODO.
Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
diff --git a/TODO b/TODO
index 4978c2f..810c878 100644
--- a/TODO
+++ b/TODO
@@ -18,6 +18,8 @@ Build/build window
Wizard
+ * Don't create config dir until end of wizard.
+
* Add simple package handling to wizard.
* Remove maximise option.
commit 5474273146c526f1247fdf757030d8d0c8bec0dd
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date: Sun Jan 20 16:36:16 2008 +0000
Display build dir when building.
Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
diff --git a/LiveMagic/controllers/build.py b/LiveMagic/controllers/build.py
index 55f6ec9..43ac663 100644
--- a/LiveMagic/controllers/build.py
+++ b/LiveMagic/controllers/build.py
@@ -30,7 +30,7 @@ class BuildController(object):
gobject.timeout_add(100, self.do_pulse_cb)
# Fork command
- cmd = ['/usr/bin/gksu', '-k', "/bin/sh -c 'sleep 0.5; lh_build 2>&1; echo lh_build returned with error code $?'"]
+ cmd = ['/usr/bin/gksu', '-k', "/bin/sh -c 'sleep 0.5; echo I: lh_build starting in `pwd`; lh_build 2>&1; echo I: lh_build returned with error code $?'"]
self.pid = self.view.vte_terminal.fork_command(cmd[0], cmd, None, self.model.dir)
if self.pid >= 0:
commit 0b38b8c0047dc6d95ec86d42fa8b0c92d14474ea
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date: Sun Jan 20 16:36:08 2008 +0000
Don't build in /tmp
Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
diff --git a/LiveMagic/models/live_helper_configuration.py b/LiveMagic/models/live_helper_configuration.py
index 3df05d0..245f837 100644
--- a/LiveMagic/models/live_helper_configuration.py
+++ b/LiveMagic/models/live_helper_configuration.py
@@ -1,8 +1,10 @@
import commands
import tempfile
import yaml
+import time
-from os.path import join, dirname
+from os.path import join, dirname, expanduser
+import os
from key_var_config_file import KeyVarConfigFile
from folder_of_files import FolderOfFiles
@@ -115,7 +117,10 @@ class LiveHelperConfiguration(object):
"""
Creates and initialises a new configuration in a temporary folder.
"""
- self.dir = tempfile.mkdtemp('live-magic')
+
+ self.dir = expanduser("~/DebianLive/%s" % time.strftime('%Y-%m-%d-%H%M%S'))
+ os.makedirs(self.dir)
+
res, out = commands.getstatusoutput('cd %s; lh_config' % self.dir)
if res != 0: raise IOError, out
self._load()
diff --git a/TODO b/TODO
index 33d5cd3..4978c2f 100644
--- a/TODO
+++ b/TODO
@@ -9,8 +9,6 @@ General
Build/build window
- * Don't build in /tmp !
-
* Better status readouts (needs live-helper patching)
* Interactive build - either support it (how?) or flag a warning if it is enabled.
commit c9c6457c224d76f376a6305348abe69f2668c276
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date: Sun Jan 20 16:22:00 2008 +0000
Update TODO.
Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
diff --git a/TODO b/TODO
index b6c72e5..33d5cd3 100644
--- a/TODO
+++ b/TODO
@@ -5,6 +5,8 @@ General
* Fix about box close dialog problem.
+ * Remove python-yaml dependency.
+
Build/build window
* Don't build in /tmp !
@@ -14,7 +16,7 @@ Build/build window
* Interactive build - either support it (how?) or flag a warning if it is enabled.
-- Debconf 'NONINTERACTIVE'
- * Use lh_build error code.
+ * Use lh_build error code, both for status of build and status of password entry.
Wizard
commit ae3ce255c1cf822d1cda982e16d60f328a2cba17
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date: Sun Jan 20 11:11:14 2008 +0000
Simplistic mirror URL guessing.
Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
diff --git a/LiveMagic/models/sources_list.py b/LiveMagic/models/sources_list.py
index 0430122..588fcd4 100644
--- a/LiveMagic/models/sources_list.py
+++ b/LiveMagic/models/sources_list.py
@@ -6,20 +6,40 @@ class SourcesList(object):
Represents /etc/apt/sources.list
"""
+ comments = re.compile(r'\s*#')
+ patterns = (
+ re.compile(r'http://ftp.?\..{2}\.debian\.org[^\s]*'),
+ re.compile(r'http://(localhost|127\.0\.0\.1)[^\s]*'),
+ re.compile(r'http://[^\s]*'),
+ )
+
def __init__(self, filename=None):
if filename is None:
- self.filename = r'/etc/apt/sources/list'
+ self.filename = r'/etc/apt/sources.list'
else:
self.filename = filename
def get_mirror(self):
result = r'http://ftp.us.debian.org/'
+ f = open(self.filename, 'r')
try:
- f = open(self.filename, 'r')
- for line in f.readlines():
- pass
- finally:
- f.close()
+ try:
+ for line in f.readlines():
+
+ if self.comments.match(line):
+ continue
+
+ for pat in self.patterns:
+ m = pat.search(line)
+ if not m:
+ continue
+
+ result = m.group(0)
+
+ finally:
+ f.close()
+ except IOError:
+ pass
return result
diff --git a/tests/test_sources_list.py b/tests/test_sources_list.py
index 95a6e9f..f0bb208 100755
--- a/tests/test_sources_list.py
+++ b/tests/test_sources_list.py
@@ -6,7 +6,7 @@ import os
import sys
sys.path.append('..')
-from LiveMagic import model
+from LiveMagic import models
class TestSourcesList(unittest.TestCase):
def setUp(self):
@@ -15,7 +15,7 @@ class TestSourcesList(unittest.TestCase):
def reset(self):
fd, self.filename = tempfile.mkstemp('live-magic')
os.close(fd)
- self.s = model.SourcesList(self.filename)
+ self.s = models.SourcesList(self.filename)
def f_w(self, contents):
f = open(self.filename, 'w+')
commit bed13b856937a86b9a45c163ab57c29c66dbdf39
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date: Sun Jan 20 09:59:58 2008 +0000
Use suggested mirror.
Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
diff --git a/LiveMagic/controllers/wizard.py b/LiveMagic/controllers/wizard.py
index fbc5752..a606989 100644
--- a/LiveMagic/controllers/wizard.py
+++ b/LiveMagic/controllers/wizard.py
@@ -1,5 +1,7 @@
import gtk
+from LiveMagic import models
+
class WizardController(object):
def on_wizard_apply(self, _):
@@ -21,3 +23,8 @@ class WizardController(object):
def on_wizard_build_completed(self):
gtk.main_quit()
+
+ def get_suggested_mirror(self):
+ s = models.SourcesList()
+ return s.get_mirror()
+
diff --git a/LiveMagic/views/wizard.py b/LiveMagic/views/wizard.py
index 7c18101..af140de 100644
--- a/LiveMagic/views/wizard.py
+++ b/LiveMagic/views/wizard.py
@@ -56,6 +56,10 @@ class WizardView(object):
asst.set_page_title(page, notebook.get_tab_label_text(page))
+ c = self['combobox_mirror']
+ c.prepend_text(self.controller.get_suggested_mirror())
+ c.set_active(0)
+
return asst
def get_wizard_completed_details(self):
commit f52bb76cb58aed1083b11f7de5222f9eef4cd41f
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date: Sun Jan 20 09:45:14 2008 +0000
Tidy ./live-magic.
Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
diff --git a/live-magic b/live-magic
index 14fd503..b43ac65 100755
--- a/live-magic
+++ b/live-magic
@@ -7,38 +7,41 @@ import gtk.glade
import os.path
import sys
-from LiveMagic.models import *
-from LiveMagic.views import *
-from LiveMagic.controllers import *
+from LiveMagic import models, views, controllers
class Model(object):
def __init__(self, dir=None):
- self.config = LiveHelperConfiguration(dir)
+ self.config = models.LiveHelperConfiguration(dir)
def __getattr__(self, k):
return getattr(self.config, k)
def __setattr__(self, k, v):
self.__dict__[k] = v
-class View(MainView, BuildView, HooksView, WizardView):
+class View(views.MainView, views.BuildView, views.HooksView, views.WizardView):
def __init__(self, controller):
- self.xml = gtk.glade.XML(glade_filename())
self.controller = controller
- MainView.__init__(self)
- BuildView.__init__(self)
- HooksView.__init__(self)
- WizardView.__init__(self)
+ self.xml = gtk.glade.XML(glade_filename())
+
+ views.MainView.__init__(self)
+ views.BuildView.__init__(self)
+ views.HooksView.__init__(self)
+ views.WizardView.__init__(self)
+
self.xml.signal_autoconnect(self.controller)
-class Controller(MainController, BuildController, HooksController, WizardController):
+class Controller(controllers.MainController,
+ controllers.BuildController,
+ controllers.HooksController,
+ controllers.WizardController):
def __init__(self, model, args):
self.model = model
- MainController.__init__(self, args)
- BuildController.__init__(self)
- HooksController.__init__(self)
- WizardController.__init__(self)
+ controllers.MainController.__init__(self, args)
+ controllers.BuildController.__init__(self)
+ controllers.HooksController.__init__(self)
+ controllers.WizardController.__init__(self)
def glade_filename():
- suffix = "main.glade"
+ suffix = 'main.glade'
local = os.path.join('glade', suffix)
if os.path.isfile(local):
commit aa45f4b818556e1d5ed0f9647f8ee6f3d9599f79
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date: Sun Jan 20 08:56:27 2008 +0000
Rename LiveMagic.model -> LiveMagic.models.
Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
diff --git a/LiveMagic/controllers/main.py b/LiveMagic/controllers/main.py
index df205ff..493daba 100644
--- a/LiveMagic/controllers/main.py
+++ b/LiveMagic/controllers/main.py
@@ -1,5 +1,5 @@
import gtk
-from LiveMagic.model import KeyVarConfigFile
+from LiveMagic.models import KeyVarConfigFile
class MainController(object):
def __init__(self, args):
diff --git a/LiveMagic/model/__init__.py b/LiveMagic/model/__init__.py
deleted file mode 100644
index f77beee..0000000
--- a/LiveMagic/model/__init__.py
+++ /dev/null
@@ -1,4 +0,0 @@
-from LiveMagic.model.live_helper_configuration import LiveHelperConfiguration
-from LiveMagic.model.key_var_config_file import KeyVarConfigFile
-from LiveMagic.model.folder_of_files import FolderOfFiles
-from LiveMagic.model.sources_list import SourcesList
diff --git a/LiveMagic/models/__init__.py b/LiveMagic/models/__init__.py
new file mode 100644
index 0000000..fa449ff
--- /dev/null
+++ b/LiveMagic/models/__init__.py
@@ -0,0 +1,4 @@
+from LiveMagic.models.live_helper_configuration import LiveHelperConfiguration
+from LiveMagic.models.key_var_config_file import KeyVarConfigFile
+from LiveMagic.models.folder_of_files import FolderOfFiles
+from LiveMagic.models.sources_list import SourcesList
diff --git a/LiveMagic/model/folder_of_files.py b/LiveMagic/models/folder_of_files.py
similarity index 100%
rename from LiveMagic/model/folder_of_files.py
rename to LiveMagic/models/folder_of_files.py
diff --git a/LiveMagic/model/key_var_config_file.py b/LiveMagic/models/key_var_config_file.py
similarity index 100%
rename from LiveMagic/model/key_var_config_file.py
rename to LiveMagic/models/key_var_config_file.py
diff --git a/LiveMagic/model/live_helper_configuration.py b/LiveMagic/models/live_helper_configuration.py
similarity index 100%
rename from LiveMagic/model/live_helper_configuration.py
rename to LiveMagic/models/live_helper_configuration.py
diff --git a/LiveMagic/model/sources_list.py b/LiveMagic/models/sources_list.py
similarity index 100%
rename from LiveMagic/model/sources_list.py
rename to LiveMagic/models/sources_list.py
diff --git a/live-magic b/live-magic
index ef134ff..14fd503 100755
--- a/live-magic
+++ b/live-magic
@@ -7,7 +7,7 @@ import gtk.glade
import os.path
import sys
-from LiveMagic.model import *
+from LiveMagic.models import *
from LiveMagic.views import *
from LiveMagic.controllers import *
diff --git a/setup.py b/setup.py
index 9198ee8..8a1884a 100755
--- a/setup.py
+++ b/setup.py
@@ -13,7 +13,7 @@ setup(
packages= [
'LiveMagic',
'LiveMagic.controllers',
- 'LiveMagic.model',
+ 'LiveMagic.models',
'LiveMagic.views',
],
data_files = [
commit e7e7ebfeff6c8599aafc54b5ce56dc2411d1f15a
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date: Sun Jan 20 08:56:03 2008 +0000
Add "Use lh_build error code." to TODO.
Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
diff --git a/TODO b/TODO
index 064e36a..b6c72e5 100644
--- a/TODO
+++ b/TODO
@@ -14,6 +14,8 @@ Build/build window
* Interactive build - either support it (how?) or flag a warning if it is enabled.
-- Debconf 'NONINTERACTIVE'
+ * Use lh_build error code.
+
Wizard
* Add simple package handling to wizard.
commit 42c805490e9dde6e2bc7af3e70f54c180edb5127
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date: Sun Jan 20 08:52:41 2008 +0000
Rename livemagic/ => LiveMagic/
Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
diff --git a/livemagic/__init__.py b/LiveMagic/__init__.py
similarity index 100%
rename from livemagic/__init__.py
rename to LiveMagic/__init__.py
diff --git a/livemagic/controllers/__init__.py b/LiveMagic/controllers/__init__.py
similarity index 100%
copy from livemagic/controllers/__init__.py
copy to LiveMagic/controllers/__init__.py
diff --git a/livemagic/controllers/build.py b/LiveMagic/controllers/build.py
similarity index 100%
rename from livemagic/controllers/build.py
rename to LiveMagic/controllers/build.py
diff --git a/livemagic/controllers/hooks.py b/LiveMagic/controllers/hooks.py
similarity index 100%
rename from livemagic/controllers/hooks.py
rename to LiveMagic/controllers/hooks.py
diff --git a/livemagic/controllers/main.py b/LiveMagic/controllers/main.py
similarity index 99%
rename from livemagic/controllers/main.py
rename to LiveMagic/controllers/main.py
index 40d2d54..df205ff 100644
--- a/livemagic/controllers/main.py
+++ b/LiveMagic/controllers/main.py
@@ -1,5 +1,5 @@
import gtk
-from livemagic.model import KeyVarConfigFile
+from LiveMagic.model import KeyVarConfigFile
class MainController(object):
def __init__(self, args):
diff --git a/livemagic/controllers/wizard.py b/LiveMagic/controllers/wizard.py
similarity index 100%
rename from livemagic/controllers/wizard.py
rename to LiveMagic/controllers/wizard.py
diff --git a/LiveMagic/model/__init__.py b/LiveMagic/model/__init__.py
new file mode 100644
index 0000000..f77beee
--- /dev/null
+++ b/LiveMagic/model/__init__.py
@@ -0,0 +1,4 @@
+from LiveMagic.model.live_helper_configuration import LiveHelperConfiguration
+from LiveMagic.model.key_var_config_file import KeyVarConfigFile
+from LiveMagic.model.folder_of_files import FolderOfFiles
+from LiveMagic.model.sources_list import SourcesList
diff --git a/livemagic/model/folder_of_files.py b/LiveMagic/model/folder_of_files.py
similarity index 100%
rename from livemagic/model/folder_of_files.py
rename to LiveMagic/model/folder_of_files.py
diff --git a/livemagic/model/key_var_config_file.py b/LiveMagic/model/key_var_config_file.py
similarity index 100%
rename from livemagic/model/key_var_config_file.py
rename to LiveMagic/model/key_var_config_file.py
diff --git a/livemagic/model/live_helper_configuration.py b/LiveMagic/model/live_helper_configuration.py
similarity index 100%
rename from livemagic/model/live_helper_configuration.py
rename to LiveMagic/model/live_helper_configuration.py
diff --git a/livemagic/model/sources_list.py b/LiveMagic/model/sources_list.py
similarity index 100%
rename from livemagic/model/sources_list.py
rename to LiveMagic/model/sources_list.py
diff --git a/livemagic/controllers/__init__.py b/LiveMagic/views/__init__.py
similarity index 100%
rename from livemagic/controllers/__init__.py
rename to LiveMagic/views/__init__.py
diff --git a/livemagic/views/build.py b/LiveMagic/views/build.py
similarity index 100%
rename from livemagic/views/build.py
rename to LiveMagic/views/build.py
diff --git a/livemagic/views/hooks.py b/LiveMagic/views/hooks.py
similarity index 100%
rename from livemagic/views/hooks.py
rename to LiveMagic/views/hooks.py
diff --git a/livemagic/views/main.py b/LiveMagic/views/main.py
similarity index 100%
rename from livemagic/views/main.py
rename to LiveMagic/views/main.py
diff --git a/livemagic/views/wizard.py b/LiveMagic/views/wizard.py
similarity index 100%
rename from livemagic/views/wizard.py
rename to LiveMagic/views/wizard.py
diff --git a/live-magic b/live-magic
index 4f020f0..ef134ff 100755
--- a/live-magic
+++ b/live-magic
@@ -7,9 +7,9 @@ import gtk.glade
import os.path
import sys
-from livemagic.model import *
-from livemagic.views import *
-from livemagic.controllers import *
+from LiveMagic.model import *
+from LiveMagic.views import *
+from LiveMagic.controllers import *
class Model(object):
def __init__(self, dir=None):
diff --git a/livemagic/model/__init__.py b/livemagic/model/__init__.py
deleted file mode 100644
index 0d5c57d..0000000
--- a/livemagic/model/__init__.py
+++ /dev/null
@@ -1,4 +0,0 @@
-from livemagic.model.live_helper_configuration import LiveHelperConfiguration
-from livemagic.model.key_var_config_file import KeyVarConfigFile
-from livemagic.model.folder_of_files import FolderOfFiles
-from livemagic.model.sources_list import SourcesList
diff --git a/livemagic/views/__init__.py b/livemagic/views/__init__.py
deleted file mode 100644
index 0dc2c48..0000000
--- a/livemagic/views/__init__.py
+++ /dev/null
@@ -1,4 +0,0 @@
-from build import *
-from main import *
-from hooks import *
-from wizard import *
diff --git a/setup.py b/setup.py
index 29da389..9198ee8 100755
--- a/setup.py
+++ b/setup.py
@@ -11,10 +11,10 @@ setup(
license = "GNU GPL v3",
scripts = ['live-magic'],
packages= [
- 'livemagic',
- 'livemagic.controllers',
- 'livemagic.model',
- 'livemagic.views',
+ 'LiveMagic',
+ 'LiveMagic.controllers',
+ 'LiveMagic.model',
+ 'LiveMagic.views',
],
data_files = [
('share/live-magic', [
diff --git a/tests/test_folder_of_files.py b/tests/test_folder_of_files.py
index a46907d..66464d8 100755
--- a/tests/test_folder_of_files.py
+++ b/tests/test_folder_of_files.py
@@ -6,7 +6,7 @@ import os
import sys
sys.path.append('..')
-from livemagic import model
+from LiveMagic import model
class TestFolderOfFiles(unittest.TestCase):
def setUp(self):
diff --git a/tests/test_key_var_config_file.py b/tests/test_key_var_config_file.py
index ad9b690..527080b 100755
--- a/tests/test_key_var_config_file.py
+++ b/tests/test_key_var_config_file.py
@@ -6,7 +6,7 @@ import os
import sys
sys.path.append('..')
-from livemagic import model
+from LiveMagic import model
class TestKeyVarConfigFile(unittest.TestCase):
def setUp(self):
diff --git a/tests/test_live_helper_configuration.py b/tests/test_live_helper_configuration.py
index 065ca16..02db9c3 100755
--- a/tests/test_live_helper_configuration.py
+++ b/tests/test_live_helper_configuration.py
@@ -6,7 +6,7 @@ import os
import sys
sys.path.append('..')
-from livemagic import model
+from LiveMagic import model
class TestConfiguration(unittest.TestCase):
def setUp(self):
diff --git a/tests/test_sources_list.py b/tests/test_sources_list.py
index 5b23d5a..95a6e9f 100755
--- a/tests/test_sources_list.py
+++ b/tests/test_sources_list.py
@@ -6,7 +6,7 @@ import os
import sys
sys.path.append('..')
-from livemagic import model
+from LiveMagic import model
class TestSourcesList(unittest.TestCase):
def setUp(self):
commit 52a4e91ee6045efbaa8e80505f7e2884c113c0b4
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date: Sun Jan 20 08:32:21 2008 +0000
Add "Don't build in /tmp !" to TODO.
Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
diff --git a/TODO b/TODO
index 0785cb0..064e36a 100644
--- a/TODO
+++ b/TODO
@@ -7,6 +7,8 @@ General
Build/build window
+ * Don't build in /tmp !
+
* Better status readouts (needs live-helper patching)
* Interactive build - either support it (how?) or flag a warning if it is enabled.
commit b214bd47e1e3462244c7abedb6781fa2f3b1d8a5
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date: Sun Jan 20 08:32:01 2008 +0000
Move to GPLv3.
Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
diff --git a/COPYING b/COPYING
index d511905..4432540 100644
--- a/COPYING
+++ b/COPYING
@@ -1,281 +1,623 @@
+
GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
+ Version 3, 29 June 2007
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
Preamble
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.) You can apply it to
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
price. Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
The precise terms and conditions for copying, distribution and
modification follow.
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
this License.
- 7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
- 9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Use with the GNU Affero General Public License.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time. Such new versions will
be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
+ Each version is given a distinguishing version number. If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
END OF TERMS AND CONDITIONS
@@ -287,15 +629,15 @@ free software which everyone can redistribute and change under these terms.
To do so, attach the following notices to the program. It is safest
to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
+state the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
Copyright (C) <year> <name of author>
- This program is free software; you can redistribute it and/or modify
+ This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
+ the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
@@ -303,37 +645,32 @@ the "copyright" line and a pointer to where the full notice is found.
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
Also add information on how to contact you by electronic and paper mail.
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
+ If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
- Gnomovision version 69, Copyright (C) year name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ <program> Copyright (C) <year> <name of author>
+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
+parts of the General Public License. Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
+ You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
- <signature of Ty Coon>, 1 April 1989
- Ty Coon, President of Vice
+ The GNU General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License. But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
diff --git a/debian/copyright b/debian/copyright
index 5334542..ca7c09a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -11,7 +11,7 @@ Upstream contact:
License:
- Copyright (C) 2007 Chris Lamb <chris at chris-lamb.co.uk>
+ Copyright (C) 2007, 2008 Chris Lamb <chris at chris-lamb.co.uk>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -28,7 +28,7 @@ License:
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
On Debian systems, the complete text of the GNU General Public License
-can be found in /usr/share/common-licenses/GPL-2 file.
+can be found in /usr/share/common-licenses/GPL-3 file.
The Debian packaging is (C) 2007, Chris Lamb <chris at chris-lamb.co.uk> and
is licensed under the GPL, see `/usr/share/common-licenses/GPL-2'.
diff --git a/livemagic/controllers/build.py b/livemagic/controllers/build.py
index ae2901d..55f6ec9 100644
--- a/livemagic/controllers/build.py
+++ b/livemagic/controllers/build.py
@@ -30,7 +30,7 @@ class BuildController(object):
gobject.timeout_add(100, self.do_pulse_cb)
# Fork command
- cmd = ['/usr/bin/gksu', '-k', "/bin/sh -c 'sleep 0.5; lh_build 2>&1'"]
+ cmd = ['/usr/bin/gksu', '-k', "/bin/sh -c 'sleep 0.5; lh_build 2>&1; echo lh_build returned with error code $?'"]
self.pid = self.view.vte_terminal.fork_command(cmd[0], cmd, None, self.model.dir)
if self.pid >= 0:
diff --git a/livemagic/views/main.py b/livemagic/views/main.py
index 81c637e..aedc60b 100644
--- a/livemagic/views/main.py
+++ b/livemagic/views/main.py
@@ -116,7 +116,7 @@ class MainView(object):
about.set_website("http://debian-live.alioth.debian.org/")
about.set_website_label("Debian Live homepage")
- about.set_license(file('/usr/share/common-licenses/GPL-2').read())
+ about.set_license(file('/usr/share/common-licenses/GPL-3').read())
logo = gtk.gdk.pixbuf_new_from_file('/usr/share/live-magic/debian_openlogo-nd-100.png')
about.set_logo(logo)
diff --git a/setup.py b/setup.py
index 303fe9c..29da389 100755
--- a/setup.py
+++ b/setup.py
@@ -8,7 +8,7 @@ setup(
maintainer = "Chris Lamb",
maintainer_email = "chris at chris-lamb.co.uk",
description = "GTK+ frontend for configuring Debian Live systems",
- license = "GNU GPL v2",
+ license = "GNU GPL v3",
scripts = ['live-magic'],
packages= [
'livemagic',
commit e1dd8686a3e025ca48c37d619e8a257e1420c56a
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date: Sun Jan 20 08:24:09 2008 +0000
Fix bug where cancelled build window couldn't be closed.
Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
diff --git a/livemagic/controllers/main.py b/livemagic/controllers/main.py
index c54f6df..40d2d54 100644
--- a/livemagic/controllers/main.py
+++ b/livemagic/controllers/main.py
@@ -91,5 +91,5 @@ class MainController(object):
def on_about_activate(self, *_):
self.view.do_show_about_dialog()
- def set_window_main_sensitive():
+ def set_window_main_sensitive(self):
self.view.do_show_main_window(True)
commit c97b6737b5587926bfc4b19f237b4a1ea858eb74
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date: Sun Jan 20 08:20:46 2008 +0000
Initial SourcesList model tests.
Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
diff --git a/livemagic/model/__init__.py b/livemagic/model/__init__.py
index 1b6dceb..0d5c57d 100644
--- a/livemagic/model/__init__.py
+++ b/livemagic/model/__init__.py
@@ -1,3 +1,4 @@
from livemagic.model.live_helper_configuration import LiveHelperConfiguration
from livemagic.model.key_var_config_file import KeyVarConfigFile
from livemagic.model.folder_of_files import FolderOfFiles
+from livemagic.model.sources_list import SourcesList
diff --git a/livemagic/model/sources_list.py b/livemagic/model/sources_list.py
new file mode 100644
index 0000000..0430122
--- /dev/null
+++ b/livemagic/model/sources_list.py
@@ -0,0 +1,25 @@
+import os
+import re
+
+class SourcesList(object):
+ """
+ Represents /etc/apt/sources.list
+ """
+
+ def __init__(self, filename=None):
+ if filename is None:
+ self.filename = r'/etc/apt/sources/list'
+ else:
+ self.filename = filename
+
+ def get_mirror(self):
+ result = r'http://ftp.us.debian.org/'
+
+ try:
+ f = open(self.filename, 'r')
+ for line in f.readlines():
+ pass
+ finally:
+ f.close()
+
+ return result
diff --git a/tests/test_sources_list.py b/tests/test_sources_list.py
new file mode 100755
index 0000000..5b23d5a
--- /dev/null
+++ b/tests/test_sources_list.py
@@ -0,0 +1,74 @@
+#!/usr/bin/env python
+
+import unittest
+import tempfile
+import os
+
+import sys
+sys.path.append('..')
+from livemagic import model
+
+class TestSourcesList(unittest.TestCase):
+ def setUp(self):
+ self.reset()
+
+ def reset(self):
+ fd, self.filename = tempfile.mkstemp('live-magic')
+ os.close(fd)
+ self.s = model.SourcesList(self.filename)
+
+ def f_w(self, contents):
+ f = open(self.filename, 'w+')
+ f.write(contents)
+ f.close()
+
+ def testIsNotNone(self):
+ self.f_w('deb http://ftp.us.debian.org/debian stable main')
+ assert self.s.get_mirror() is not None
+
+ # Match types
+ def _match_type(self, url):
+ self.f_w('deb %s stable main' % url)
+ return self.s.get_mirror() == url
+
+ def testDebianMirror(self):
+ assert self._match_type('http://ftp.uk.debian.org/debian')
+
+ def testLocalhost(self):
+ assert self._match_type('http://localhost/debian')
+
+ def testOtherURL(self):
+ assert self._match_type('http://the.earth.li/debian')
+
+ def testNoSecurity(self):
+ assert not self._match_type('http://security.debian.org/debian')
+
+ def testNoBackports(self):
+ assert not self._match_type('http://www.backports.debian.org/debian')
+
+ # Preferences
+ def _prefer(self, ordering):
+ def test():
+ self.f_w("""
+ deb %s stable main
+ deb %s stable main
+ """ % (ordering[0], ordering[1]))
+
+ assert self.s.get_mirror() == ordering[0]
+
+ test()
+ ordering.reverse()
+ self.reset()
+ test()
+
+ def testPreferLocalhost(self):
+ self._prefer(['http://localhost/debian', 'http://ftp.uk.debian.org/debian'])
+
+ def testPreferCountry(self):
+ self._prefer(['http://ftp.uk.debian.org/debian', 'http://ftp.debian.org/debian'])
+
+ def testPreferNonOfficial(self):
+ self._prefer(['http://ftp.uk.debian.org/debian', 'http://backports.debian.org/debian'])
+
+if __name__ == "__main__":
+ unittest.main()
commit 366b8521069a2a87782ef36f18b030afa1818ae5
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date: Sun Jan 20 05:45:16 2008 +0000
Use a different method for spawning lh_build.
Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
diff --git a/livemagic/controllers/build.py b/livemagic/controllers/build.py
index 7eab88f..ae2901d 100644
--- a/livemagic/controllers/build.py
+++ b/livemagic/controllers/build.py
@@ -30,7 +30,7 @@ class BuildController(object):
gobject.timeout_add(100, self.do_pulse_cb)
# Fork command
- cmd = ['gksu', 'lh_build']
+ cmd = ['/usr/bin/gksu', '-k', "/bin/sh -c 'sleep 0.5; lh_build 2>&1'"]
self.pid = self.view.vte_terminal.fork_command(cmd[0], cmd, None, self.model.dir)
if self.pid >= 0:
commit 3958edf2a3b322f6933f28b9a890e4c577474d08
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date: Sun Jan 20 05:40:48 2008 +0000
Add constant movement of status bar.
Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
diff --git a/TODO b/TODO
index bdd4791..0785cb0 100644
--- a/TODO
+++ b/TODO
@@ -7,8 +7,6 @@ General
Build/build window
- * Constant movement of status bar
-
* Better status readouts (needs live-helper patching)
* Interactive build - either support it (how?) or flag a warning if it is enabled.
diff --git a/livemagic/controllers/build.py b/livemagic/controllers/build.py
index c5c81d9..7eab88f 100644
--- a/livemagic/controllers/build.py
+++ b/livemagic/controllers/build.py
@@ -1,5 +1,6 @@
import os
import signal
+import gobject
class BuildController(object):
@@ -25,6 +26,9 @@ class BuildController(object):
# Show window
self.view.do_show_window_build(build_close_callback)
+ # Start pulsing
+ gobject.timeout_add(100, self.do_pulse_cb)
+
# Fork command
cmd = ['gksu', 'lh_build']
self.pid = self.view.vte_terminal.fork_command(cmd[0], cmd, None, self.model.dir)
@@ -62,8 +66,9 @@ class BuildController(object):
"Your Debian Live system has been created successfully.")
self.view.set_build_status("Build process complete.")
- def on_vte_contents_changed(self, *_):
+ def do_pulse_cb(self, *_):
self.view.do_build_pulse()
+ return self.pid > 0
def on_button_build_close_clicked(self, *_):
# The build button is only sensitive when it is safe to close, so
diff --git a/livemagic/views/build.py b/livemagic/views/build.py
index 7b31789..f9c3ef9 100644
--- a/livemagic/views/build.py
+++ b/livemagic/views/build.py
@@ -19,7 +19,6 @@ class BuildView(object):
# Connect signals from VteTerminal
t.connect('child-exited', self.controller.on_vte_child_exited)
- t.connect('contents-changed', self.controller.on_vte_contents_changed)
self.vte_terminal = t
commit 8040574dff5777ba132b372b90e7d51bf55493fd
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date: Sun Jan 20 05:39:43 2008 +0000
Fix bug where wizard based builds would traceback on complete.
Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
diff --git a/livemagic/controllers/build.py b/livemagic/controllers/build.py
index 52b355b..c5c81d9 100644
--- a/livemagic/controllers/build.py
+++ b/livemagic/controllers/build.py
@@ -6,8 +6,6 @@ class BuildController(object):
# GTK callbacks
def on_build_activate(self, *_):
- self.cancelled = False
-
# Save model if necessary
if self.model.altered():
self.model.save()
@@ -15,6 +13,8 @@ class BuildController(object):
self.do_show_build_window(self.set_window_main_sensitive)
def do_show_build_window(self, build_close_callback):
+ self.cancelled = False
+
# Set initial titles and state
self.view.set_build_titles("Generating Debian Live system...", \
"Generating Debian Live system.", \
commit 344973b59cafe911760199038208ae4c68a75d6b
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date: Tue Jan 15 04:46:28 2008 +0000
Update TODO.
Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
diff --git a/TODO b/TODO
index 24a41c1..bdd4791 100644
--- a/TODO
+++ b/TODO
@@ -24,6 +24,8 @@ Wizard
this is bad and/or infeasible, but it would be preferably to an empty box.
* Pressing 'ENTER' on fields moves to next page.
+
+ * Only ask architecture question on amd64.
Expert mode
commit 7c7f9089ee6f5db3f5a6ee9094c8409123212e5e
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date: Mon Jan 14 23:02:51 2008 +0000
Rework TODO.
Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
diff --git a/TODO b/TODO
index 6666a81..24a41c1 100644
--- a/TODO
+++ b/TODO
@@ -1,14 +1,35 @@
live-magic TODO
===============
+General
+
+ * Fix about box close dialog problem.
+
+Build/build window
+
+ * Constant movement of status bar
+
+ * Better status readouts (needs live-helper patching)
+
+ * Interactive build - either support it (how?) or flag a warning if it is enabled.
+ -- Debconf 'NONINTERACTIVE'
+
Wizard
* Add simple package handling to wizard.
- * API stuff
- * gtk.ComboBox / gtk.ComboBoxEntry requires gtk.ListStore as backing model?
- * File selectors (preseed, splash screen) (gtk.Entry with 'Select' button)
- * Tasks - task list sufficiently static? Probably needs its own page?
+ * Remove maximise option.
+
+ * Find mirror "automatically". There are some debian-devel list posts about why
+ this is bad and/or infeasible, but it would be preferably to an empty box.
+
+ * Pressing 'ENTER' on fields moves to next page.
+
+Expert mode
+
+ * File selectors (preseed, splash screen) (gtk.Entry with 'Select' button)
+
+ * Tasks - task list sufficiently static? Probably needs its own page?
* Dependencies between options. For example, it doesn't make sense
to display the LH_ISO_AUTHOR etc if the ISO binary type is not
@@ -22,20 +43,11 @@ Wizard
"Hidden" depends - eg. LH_BOOTSTRAP_KEYRING only makes sense when using
debootstrap (cdebootstrap does not have this option afaict).
- * Reading of std(in|out|err) from gtk.VteTerminal.
- * Better status readout
- * Constant movement of status bar
- * Interactive build - either support it (how?) or flag a warning if it is enabled.
- -- Debconf 'NONINTERACTIVE'
- * Fix about box close dialog problem.
-
- * Remove maximise option from wizard
-
- * Find mirror "automatically". There are some debian-devel list posts about why
- this is bad and/or infeasible, but it would be preferably to an empty box.
API
- * Add build() to LiveHelperConfiguration.
+
+ * Add build() to LiveHelperConfiguration?
+
Would allow saner build scripts:
#!/usr/bin/env python
@@ -50,4 +62,3 @@ API
# Would need some way of saving logs.
# Reliable method of getting locations of resulting ISOs.
-
commit 5702af714f3a9ce77eb4c8f8ba1abe5aa9c5cd27
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date: Mon Jan 14 21:20:22 2008 +0000
Add simple package handling entry to TODO.
Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
diff --git a/TODO b/TODO
index c6a6579..6666a81 100644
--- a/TODO
+++ b/TODO
@@ -3,6 +3,8 @@ live-magic TODO
Wizard
+ * Add simple package handling to wizard.
+
* API stuff
* gtk.ComboBox / gtk.ComboBoxEntry requires gtk.ListStore as backing model?
* File selectors (preseed, splash screen) (gtk.Entry with 'Select' button)
commit 6e38bb4167bc6a1273e5827c2e019193659a2e32
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date: Mon Jan 14 21:20:08 2008 +0000
Update changelog.
Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
diff --git a/debian/changelog b/debian/changelog
index 23f3e17..72eed0a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+live-magic (0.4) UNRELEASED; urgency=low
+
+ * Don't include "-num" in version.
+ * Use LIVE_ not LH_ (Closes: #443124)
+
+ -- Chris Lamb <chris at chris-lamb.co.uk> Mon, 14 Jan 2008 18:36:43 +0000
+
live-magic (0.3-1) unstable; urgency=low
* New upstream release:
commit 8f13075f92ec6c8ccec26eb3c8ec50afb2b33a4c
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date: Mon Jan 14 21:20:00 2008 +0000
Remove .dch temporary file.
Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
diff --git a/debian/changelog.dch b/debian/changelog.dch
deleted file mode 100644
index 9c84c10..0000000
--- a/debian/changelog.dch
+++ /dev/null
@@ -1,29 +0,0 @@
-live-magic (0.4) UNRELEASED; urgency=low
-
- * Don't include "-num" in version.
-
- -- Chris Lamb <chris at chris-lamb.co.uk> Mon, 14 Jan 2008 18:36:43 +0000
-
-live-magic (0.3-1) unstable; urgency=low
-
- * New upstream release:
- * Update setup.py with additional media. (Closes: #441702)
- * Remove a few unnecessary menu options. (Closes: #441742)
- * Remove GNUstep from options.
- * Add live-magic(1) manpage.
- * Merged a few packaging and typographical errors from Daniel
- Baumann <daniel at debian.org>.
-
- -- Chris Lamb <chris at chris-lamb.co.uk> Sun, 26 Aug 2007 13:32:00 +0100
-
-live-magic (0.2-1) unstable; urgency=low
-
- * New upstream release.
-
- -- Chris Lamb <chris at chris-lamb.co.uk> Thu, 16 Aug 2007 21:35:46 +0100
-
-live-magic (0.1-1) unstable; urgency=low
-
- * Initial release.
-
- -- Chris Lamb <chris at chris-lamb.co.uk> Mon, 28 May 2007 12:31:20 +0100
commit c1a253bb8eb9a0eb3e17f19abfcaca714ff81e5b
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date: Mon Jan 14 18:37:29 2008 +0000
Add new changelog entry.
Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
diff --git a/debian/changelog b/debian/changelog.dch
similarity index 82%
copy from debian/changelog
copy to debian/changelog.dch
index 23f3e17..9c84c10 100644
--- a/debian/changelog
+++ b/debian/changelog.dch
@@ -1,3 +1,9 @@
+live-magic (0.4) UNRELEASED; urgency=low
+
+ * Don't include "-num" in version.
+
+ -- Chris Lamb <chris at chris-lamb.co.uk> Mon, 14 Jan 2008 18:36:43 +0000
+
live-magic (0.3-1) unstable; urgency=low
* New upstream release:
commit 5d5244146ceccef978718729d88ed788a6bf98ad
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date: Mon Jan 14 18:35:28 2008 +0000
Update TODO.
Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
diff --git a/TODO b/TODO
index fe399aa..c6a6579 100644
--- a/TODO
+++ b/TODO
@@ -3,29 +3,21 @@ live-magic TODO
Wizard
- * 6 stages:
- 1. Welcome
- 2. Image type
- 3. Target media
- 4. Architecture
- 5. Mirror (map)
- 6. Ready to build
-
* API stuff
* gtk.ComboBox / gtk.ComboBoxEntry requires gtk.ListStore as backing model?
* File selectors (preseed, splash screen) (gtk.Entry with 'Select' button)
* Tasks - task list sufficiently static? Probably needs its own page?
* Dependencies between options. For example, it doesn't make sense
- to display the LIVE_ISO_AUTHOR etc if the ISO binary type is not
+ to display the LH_ISO_AUTHOR etc if the ISO binary type is not
selected.
depends = [
- 'common/LIVE_ISO_APPLICATION': lambda: 'iso' in self.model.binary.LIVE_BINARY_IMAGES,
- 'common/LIVE_GRUB_SPLASH': lambda: self.model.binary.LIVE_BOOTLOADER == 'grub',
+ 'common/LH_ISO_APPLICATION': lambda: 'iso' in self.model.binary.LH_BINARY_IMAGES,
+ 'common/LH_GRUB_SPLASH': lambda: self.model.binary.LH_BOOTLOADER == 'grub',
]
- "Hidden" depends - eg. LIVE_BOOTSTRAP_KEYRING only makes sense when using
+ "Hidden" depends - eg. LH_BOOTSTRAP_KEYRING only makes sense when using
debootstrap (cdebootstrap does not have this option afaict).
* Reading of std(in|out|err) from gtk.VteTerminal.
@@ -34,6 +26,11 @@ Wizard
* Interactive build - either support it (how?) or flag a warning if it is enabled.
-- Debconf 'NONINTERACTIVE'
* Fix about box close dialog problem.
+
+ * Remove maximise option from wizard
+
+ * Find mirror "automatically". There are some debian-devel list posts about why
+ this is bad and/or infeasible, but it would be preferably to an empty box.
API
* Add build() to LiveHelperConfiguration.
@@ -43,9 +40,9 @@ API
import os
import livehelper
lh = livehelper.Configuration()
- lh.binary.LIVE_BINARY_IMAGES = ['iso', 'usb-hdd', 'net']
+ lh.binary.LH_BINARY_IMAGES = ['iso', 'usb-hdd', 'net']
for pkg_list in ['gnome', 'kde', 'standard', 'rescue']:
- lh.common.LIVE_PACKAGES_LISTS = pkg_list
+ lh.common.LH_PACKAGES_LISTS = pkg_list
result = lh.build(save=True)
print type(result), result
commit d4a27a948c45dca59ad3c6900f48cf80c0e31668
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date: Mon Jan 14 18:31:57 2008 +0000
Rename LIVE_ -> LH_
Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
diff --git a/glade/main.glade b/glade/main.glade
index cd312a1..ab0670e 100644
--- a/glade/main.glade
+++ b/glade/main.glade
@@ -725,7 +725,7 @@ Aptitude</property>
</widget>
</child>
<child>
- <widget class="GtkComboBox" id="chroot/LIVE_CHROOT_FILESYSTEM">
+ <widget class="GtkComboBox" id="chroot/LH_CHROOT_FILESYSTEM">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="items" translatable="yes">SquashFS
@@ -1319,7 +1319,7 @@ vservers</property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="binary/LIVE_HOSTNAME2">
+ <widget class="GtkEntry" id="binary/LH_HOSTNAME2">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -1344,7 +1344,7 @@ vservers</property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="common/LIVE_ISO_AUTHOR">
+ <widget class="GtkEntry" id="common/LH_ISO_AUTHOR">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -1369,7 +1369,7 @@ vservers</property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="common/LIVE_ISO_PREPARER3">
+ <widget class="GtkEntry" id="common/LH_ISO_PREPARER3">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -1418,7 +1418,7 @@ vservers</property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="binary/LIVE_ISO_PREPARER1">
+ <widget class="GtkEntry" id="binary/LH_ISO_PREPARER1">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -1431,7 +1431,7 @@ vservers</property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="binary/LIVE_ISO_VOLUME1">
+ <widget class="GtkEntry" id="binary/LH_ISO_VOLUME1">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -1456,7 +1456,7 @@ vservers</property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="binary/LIVE_NET_SERVER1">
+ <widget class="GtkEntry" id="binary/LH_NET_SERVER1">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -1497,7 +1497,7 @@ vservers</property>
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="common/LIVE_MEMTEST">
+ <widget class="GtkComboBox" id="common/LH_MEMTEST">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="items" translatable="yes">Memtest86+</property>
@@ -1510,7 +1510,7 @@ vservers</property>
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="binary/LIVE_BOOTLOADER">
+ <widget class="GtkComboBox" id="binary/LH_BOOTLOADER">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="items" translatable="yes">Syslinux
@@ -1537,7 +1537,7 @@ Yaboot</property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="common/LIVE_GRUB_SPLASH">
+ <widget class="GtkEntry" id="common/LH_GRUB_SPLASH">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
@@ -1562,7 +1562,7 @@ Yaboot</property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="common/LIVE_SYSLINUX_SPLASH">
+ <widget class="GtkEntry" id="common/LH_SYSLINUX_SPLASH">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
diff --git a/livemagic/controllers/wizard.py b/livemagic/controllers/wizard.py
index 0fcfff8..fbc5752 100644
--- a/livemagic/controllers/wizard.py
+++ b/livemagic/controllers/wizard.py
@@ -6,10 +6,10 @@ class WizardController(object):
# Fill in data from model
data = self.view.get_wizard_completed_details()
- self.model.binary.LIVE_BINARY_IMAGES = [data['media']]
- self.model.bootstrap.LIVE_MIRROR_BOOTSTRAP = data['mirror']
- self.model.chroot.LIVE_PACKAGES_LISTS = data['desktop']
- self.model.bootstrap.LIVE_ARCHITECTURE = data['arch']
+ self.model.binary.LH_BINARY_IMAGES = [data['media']]
+ self.model.bootstrap.LH_MIRROR_BOOTSTRAP = data['mirror']
+ self.model.chroot.LH_PACKAGES_LISTS = data['desktop']
+ self.model.bootstrap.LH_ARCHITECTURE = data['arch']
self.model.save()
self.view.do_dim_wizard()
diff --git a/livemagic/model/key_var_config_file.py b/livemagic/model/key_var_config_file.py
index abe3d6f..53f3409 100644
--- a/livemagic/model/key_var_config_file.py
+++ b/livemagic/model/key_var_config_file.py
@@ -30,7 +30,7 @@ class KeyVarConfigFile(object):
"""
Returns True if var is a configuration variable for Debian Live.
"""
- return var.startswith('LIVE_') or var.startswith('LIVE_')
+ return var.startswith('LH_') or var.startswith('LH_')
def __setattr__(self, k, v):
if self.is_lh_variable(k):
diff --git a/livemagic/model/live_helper_configuration.py b/livemagic/model/live_helper_configuration.py
index 9dd9eda..3df05d0 100644
--- a/livemagic/model/live_helper_configuration.py
+++ b/livemagic/model/live_helper_configuration.py
@@ -10,86 +10,86 @@ from folder_of_files import FolderOfFiles
spec_str = """
key_value:
common:
- LIVE_APT : string
- LIVE_APT_FTPPROXY : string
- LIVE_APT_HTTPPROXY : string
- LIVE_APT_PDIFFS : boolean
- LIVE_APT_PIPELINE : int
- LIVE_APT_RECOMMENDS : boolean
- LIVE_APT_SECURE : boolean
- LIVE_BOOTSTRAP : string
- LIVE_CACHE_INDICES : boolean
- LIVE_CACHE_PACKAGES : boolean
- LIVE_CACHE_STAGES : list
- LIVE_DEBCONF_FRONTEND : string
- LIVE_DEBCONF_NOWARNINGS : boolean
- LIVE_DEBCONF_PRIORITY : string
- LIVE_GENISOIMAGE : string
- LIVE_INITRAMFS : string
- LIVE_LOSETUP : string
- LIVE_MODE : string
- LIVE_ROOT_COMMAND : string
- LIVE_TASKSEL : string
- LIVE_ROOT : string
- LIVE_INCLUDES : string
- LIVE_TEMPLATES : string
- LIVE_BREAKPOINTS : boolean
- LIVE_DEBUG : boolean
- LIVE_FORCE : boolean
- LIVE_QUIET : boolean
- LIVE_VERBOSE : boolean
+ LH_APT : string
+ LH_APT_FTPPROXY : string
+ LH_APT_HTTPPROXY : string
+ LH_APT_PDIFFS : boolean
+ LH_APT_PIPELINE : int
+ LH_APT_RECOMMENDS : boolean
+ LH_APT_SECURE : boolean
+ LH_BOOTSTRAP : string
+ LH_CACHE_INDICES : boolean
+ LH_CACHE_PACKAGES : boolean
+ LH_CACHE_STAGES : list
+ LH_DEBCONF_FRONTEND : string
+ LH_DEBCONF_NOWARNINGS : boolean
+ LH_DEBCONF_PRIORITY : string
+ LH_GENISOIMAGE : string
+ LH_INITRAMFS : string
+ LH_LOSETUP : string
+ LH_MODE : string
+ LH_ROOT_COMMAND : string
+ LH_TASKSEL : string
+ LH_ROOT : string
+ LH_INCLUDES : string
+ LH_TEMPLATES : string
+ LH_BREAKPOINTS : boolean
+ LH_DEBUG : boolean
+ LH_FORCE : boolean
+ LH_QUIET : boolean
+ LH_VERBOSE : boolean
bootstrap:
- LIVE_ARCHITECTURE : list
- LIVE_BOOTSTRAP_CONFIG : string
- LIVE_BOOTSTRAP_FLAVOUR : string
- LIVE_BOOTSTRAP_KEYRING : string
- LIVE_DISTRIBUTION : string
- LIVE_MIRROR_BOOTSTRAP : string
- LIVE_MIRROR_BOOTSTRAP_SECURITY : string
- LIVE_MIRROR_BINARY : string
- LIVE_MIRROR_BINARY_SECURITY : string
- LIVE_SECTIONS : list
+ LH_ARCHITECTURE : list
+ LH_BOOTSTRAP_CONFIG : string
+ LH_BOOTSTRAP_FLAVOUR : string
+ LH_BOOTSTRAP_KEYRING : string
+ LH_DISTRIBUTION : string
+ LH_MIRROR_BOOTSTRAP : string
+ LH_MIRROR_BOOTSTRAP_SECURITY : string
+ LH_MIRROR_BINARY : string
+ LH_MIRROR_BINARY_SECURITY : string
+ LH_SECTIONS : list
chroot:
- LIVE_CHROOT_FILESYSTEM : string
- LIVE_UNION_FILESYSTEM : string
- LIVE_HOOKS : list
- LIVE_INTERACTIVE : boolean
- LIVE_KEYRING_PACKAGES : list
- LIVE_LANGUAGE : string
- LIVE_LINUX_FLAVOURS : list
- LIVE_LINUX_PACKAGES : list
- LIVE_PACKAGES : list
- LIVE_PACKAGES_LISTS : string
- LIVE_PRESEED : string
- LIVE_TASKS : list
- LIVE_SECURITY : boolean
- LIVE_SYMLINKS : boolean
- LIVE_SYSVINIT : boolean
+ LH_CHROOT_FILESYSTEM : string
+ LH_UNION_FILESYSTEM : string
+ LH_HOOKS : list
+ LH_INTERACTIVE : boolean
+ LH_KEYRING_PACKAGES : list
+ LH_LANGUAGE : string
+ LH_LINUX_FLAVOURS : list
+ LH_LINUX_PACKAGES : list
+ LH_PACKAGES : list
+ LH_PACKAGES_LISTS : string
+ LH_PRESEED : string
+ LH_TASKS : list
+ LH_SECURITY : boolean
+ LH_SYMLINKS : boolean
+ LH_SYSVINIT : boolean
binary:
- LIVE_BINARY_IMAGES : string
- LIVE_BINARY_INDICES : boolean
- LIVE_BOOTAPPEND : string
- LIVE_BOOTLOADER : string
- LIVE_DEBIAN_INSTALLER : boolean
- LIVE_ENCRYPTION : string
- LIVE_GRUB_SPLASH : string
- LIVE_HOSTNAME : string
- LIVE_ISO_APPLICATION : string
- LIVE_ISO_PREPARER : string
- LIVE_ISO_PUBLISHER : string
- LIVE_ISO_VOLUME : string
- LIVE_MEMTEST : string
- LIVE_NET_PATH : string
- LIVE_NET_SERVER : string
- LIVE_SYSLINUX_SPLASH : string
- LIVE_USERNAME : string
+ LH_BINARY_IMAGES : string
+ LH_BINARY_INDICES : boolean
+ LH_BOOTAPPEND : string
+ LH_BOOTLOADER : string
+ LH_DEBIAN_INSTALLER : boolean
+ LH_ENCRYPTION : string
+ LH_GRUB_SPLASH : string
+ LH_HOSTNAME : string
+ LH_ISO_APPLICATION : string
+ LH_ISO_PREPARER : string
+ LH_ISO_PUBLISHER : string
+ LH_ISO_VOLUME : string
+ LH_MEMTEST : string
+ LH_NET_PATH : string
+ LH_NET_SERVER : string
+ LH_SYSLINUX_SPLASH : string
+ LH_USERNAME : string
source:
- LIVE_SOURCE : boolean
- LIVE_SOURCE_IMAGES : list
+ LH_SOURCE : boolean
+ LH_SOURCE_IMAGES : list
folder_of_files:
chroot_local-hooks
diff --git a/tests/test_key_var_config_file.py b/tests/test_key_var_config_file.py
index 1cc5f2d..ad9b690 100755
--- a/tests/test_key_var_config_file.py
+++ b/tests/test_key_var_config_file.py
@@ -13,10 +13,10 @@ class TestKeyVarConfigFile(unittest.TestCase):
fd, self.filename = tempfile.mkstemp('live-magic')
os.close(fd)
spec = {
- 'LIVE_SPAM': 'string',
- 'LIVE_MORESPAM': 'string',
- 'LIVE_SPAMLIST' : 'list',
- 'LIVE_SPAMBOOL' : 'boolean',
+ 'LH_SPAM': 'string',
+ 'LH_MORESPAM': 'string',
+ 'LH_SPAMLIST' : 'list',
+ 'LH_SPAMBOOL' : 'boolean',
}
self.keyvar = model.KeyVarConfigFile(self.filename, spec)
@@ -31,34 +31,34 @@ class TestKeyVarConfigFile(unittest.TestCase):
f.close()
def testSetAndGetOption(self):
- self.keyvar.LIVE_SPAM = "eggs"
- assert self.keyvar.LIVE_SPAM == "eggs"
+ self.keyvar.LH_SPAM = "eggs"
+ assert self.keyvar.LH_SPAM == "eggs"
def testSaveKnownOption(self):
- self.keyvar.LIVE_SPAM = "eggs"
+ self.keyvar.LH_SPAM = "eggs"
self.keyvar.save()
- assert 'LIVE_SPAM="eggs"\n' in self.f_c()
+ assert 'LH_SPAM="eggs"\n' in self.f_c()
def testSaveUnknownOption(self):
"""
Unknown configuration keys should be added to the file.
"""
assert len(self.f_c()) == 0
- self.keyvar.LIVE_SPAM = "eggs"
+ self.keyvar.LH_SPAM = "eggs"
self.keyvar.save()
- assert 'LIVE_SPAM="eggs"\n' in self.f_c()
+ assert 'LH_SPAM="eggs"\n' in self.f_c()
def testUpdatesOptions(self):
"""
Updating an existing option should not increase the length of the file.
"""
- self.keyvar.LIVE_SPAM = "eggs"
- self.keyvar.LIVE_MORESPAM = "moreeggs"
+ self.keyvar.LH_SPAM = "eggs"
+ self.keyvar.LH_MORESPAM = "moreeggs"
self.keyvar.save()
self.keyvar.save()
self.keyvar.load()
save = len(self.f_c())
- self.keyvar.LIVE_SPAM = "yetmoreeggs"
+ self.keyvar.LH_SPAM = "yetmoreeggs"
self.keyvar.save()
assert len(self.f_c()) == save
@@ -67,7 +67,7 @@ class TestKeyVarConfigFile(unittest.TestCase):
Should change state when they have been altered.
"""
assert self.keyvar.altered() == False
- self.keyvar.LIVE_SPAM = "eggs"
+ self.keyvar.LH_SPAM = "eggs"
assert self.keyvar.altered() == True
def testConfLoadResetState(self):
@@ -75,11 +75,11 @@ class TestKeyVarConfigFile(unittest.TestCase):
Reloading the configuration should reset state.
"""
assert self.keyvar.altered() == False
- self.keyvar.LIVE_SPAM = "eggs"
+ self.keyvar.LH_SPAM = "eggs"
assert self.keyvar.altered() == True
self.keyvar.load()
assert self.keyvar.altered() == False
- assert not hasattr(self.keyvar, 'LIVE_SPAM')
+ assert not hasattr(self.keyvar, 'LH_SPAM')
def testSavingEscapingCharacters(self):
"""
@@ -92,9 +92,9 @@ class TestKeyVarConfigFile(unittest.TestCase):
r'\ '[:-1] : r'\\ '[:-1],
}
for input, expected in tests.iteritems():
- self.keyvar.LIVE_TEST = input
+ self.keyvar.LH_TEST = input
self.keyvar.save()
- self.assert_('LIVE_TEST="%s"\n' % expected in self.f_c(), \
+ self.assert_('LH_TEST="%s"\n' % expected in self.f_c(), \
"Input was '%s', expected '%s'" % (input, expected))
def testLoadingEscapedCharacters(self):
@@ -111,26 +111,26 @@ class TestKeyVarConfigFile(unittest.TestCase):
for input, expected in tests.iteritems():
# Write escaped string
- self.f_w('LIVE_SPAM="%s"' % input)
+ self.f_w('LH_SPAM="%s"' % input)
# Reload configuration and check against expected value
self.keyvar.load()
- self.assert_(self.keyvar.LIVE_SPAM == expected, \
- "Got back '%s', expected '%s'" % (self.keyvar.LIVE_SPAM, expected))
+ self.assert_(self.keyvar.LH_SPAM == expected, \
+ "Got back '%s', expected '%s'" % (self.keyvar.LH_SPAM, expected))
def testNonStandardAlignmentAcceptance(self):
"""
Tests acceptance of strange alignments/configurations/spacings of KEY="value" pairs.
"""
accept = [
- r'LIVE_SPAM="eggs"',
- r' LIVE_SPAM="eggs" ',
- r'LIVE_SPAM="eggs" # comment # comment ',
- r'LIVE_SPAM="eggs" # comment with a " " sign',
- r'LIVE_SPAM="eggs" ',
- r'LIVE_SPAM=eggs',
- r'LIVE_SPAM=eggs ',
- r"LIVE_SPAM='eggs' ",
+ r'LH_SPAM="eggs"',
+ r' LH_SPAM="eggs" ',
+ r'LH_SPAM="eggs" # comment # comment ',
+ r'LH_SPAM="eggs" # comment with a " " sign',
+ r'LH_SPAM="eggs" ',
+ r'LH_SPAM=eggs',
+ r'LH_SPAM=eggs ',
+ r"LH_SPAM='eggs' ",
]
for a in accept:
self.f_w(a)
@@ -139,7 +139,7 @@ class TestKeyVarConfigFile(unittest.TestCase):
self.keyvar.load()
msg = "Should have accepted '%s'" % a
try:
- self.assert_(self.keyvar.LIVE_SPAM == 'eggs', msg + ", saw '%s'" % self.keyvar.LIVE_SPAM)
+ self.assert_(self.keyvar.LH_SPAM == 'eggs', msg + ", saw '%s'" % self.keyvar.LH_SPAM)
except AttributeError:
self.fail(msg=msg)
@@ -148,19 +148,19 @@ class TestKeyVarConfigFile(unittest.TestCase):
Tests rejection strange alignments/configurations/spacings of KEY="value" pairs.
"""
reject = [
- r'#LIVE_SPAM="eggs"', # commented out
- r'LIVE_SPAM ="eggs"',
- r'LIVE_SPAM= "eggs"',
- r'LIVE_SPAM="eggs',
- r'LIVE_SPAM=eggs"',
- r'LIVE_SPAM=spam eggs',
+ r'#LH_SPAM="eggs"', # commented out
+ r'LH_SPAM ="eggs"',
+ r'LH_SPAM= "eggs"',
+ r'LH_SPAM="eggs',
+ r'LH_SPAM=eggs"',
+ r'LH_SPAM=spam eggs',
]
for r in reject:
self.f_w(r)
# Reload configuration and check against expected value
self.keyvar.load()
- self.assert_(not hasattr(self.keyvar, 'LIVE_SPAM'), "Should have rejected '%s'" % r)
+ self.assert_(not hasattr(self.keyvar, 'LH_SPAM'), "Should have rejected '%s'" % r)
def testSaveList(self):
expected = [
@@ -172,9 +172,9 @@ class TestKeyVarConfigFile(unittest.TestCase):
]
for k, v in expected:
- self.keyvar.LIVE_SPAMLIST = k
+ self.keyvar.LH_SPAMLIST = k
self.keyvar.save()
- assert 'LIVE_SPAMLIST="%s"\n' % v in self.f_c()
+ assert 'LH_SPAMLIST="%s"\n' % v in self.f_c()
def testLoadList(self):
expected = {
@@ -184,9 +184,9 @@ class TestKeyVarConfigFile(unittest.TestCase):
}
for k, v in expected.iteritems():
- self.f_w('LIVE_SPAMLIST="%s"' % k)
+ self.f_w('LH_SPAMLIST="%s"' % k)
self.keyvar.load()
- assert self.keyvar.LIVE_SPAMLIST == v
+ assert self.keyvar.LH_SPAMLIST == v
def testSaveBool(self):
expected = {
@@ -196,9 +196,9 @@ class TestKeyVarConfigFile(unittest.TestCase):
}
for k, v in expected.iteritems():
- self.keyvar.LIVE_SPAMBOOL = k
+ self.keyvar.LH_SPAMBOOL = k
self.keyvar.save()
- assert 'LIVE_SPAMBOOL="%s"\n' % v in self.f_c()
+ assert 'LH_SPAMBOOL="%s"\n' % v in self.f_c()
def testBooleanTypeLoad(self):
expected = {
@@ -210,9 +210,9 @@ class TestKeyVarConfigFile(unittest.TestCase):
}
for k, v in expected.iteritems():
- self.f_w('LIVE_SPAMBOOL="%s"' % k)
+ self.f_w('LH_SPAMBOOL="%s"' % k)
self.keyvar.load()
- assert self.keyvar.LIVE_SPAMBOOL == v
+ assert self.keyvar.LH_SPAMBOOL == v
if __name__ == "__main__":
unittest.main()
diff --git a/tests/test_live_helper_configuration.py b/tests/test_live_helper_configuration.py
index a1c6c45..065ca16 100755
--- a/tests/test_live_helper_configuration.py
+++ b/tests/test_live_helper_configuration.py
@@ -26,33 +26,33 @@ class TestConfiguration(unittest.TestCase):
"""
new() should load a new configuration.
"""
- self.conf.common.LIVE_SPAM = "eggs"
+ self.conf.common.LH_SPAM = "eggs"
self.conf.save()
saved_dir = self.conf.dir
self.conf.new()
- assert not hasattr(self.conf.common, 'LIVE_SPAM')
+ assert not hasattr(self.conf.common, 'LH_SPAM')
self.conf.open(saved_dir)
- assert self.conf.common.LIVE_SPAM == "eggs"
+ assert self.conf.common.LH_SPAM == "eggs"
def testGetOption(self):
- assert "apt" in self.conf.common.LIVE_APT
+ assert "apt" in self.conf.common.LH_APT
def testSetKnownOption(self):
- self.conf.common.LIVE_APT = "apt-get"
- assert self.conf.common.LIVE_APT == "apt-get"
+ self.conf.common.LH_APT = "apt-get"
+ assert self.conf.common.LH_APT == "apt-get"
def testSetUnknownOption(self):
- self.conf.common.LIVE_UNKNOWN_OPTION = "Testing value"
- assert self.conf.common.LIVE_UNKNOWN_OPTION == "Testing value"
+ self.conf.common.LH_UNKNOWN_OPTION = "Testing value"
+ assert self.conf.common.LH_UNKNOWN_OPTION == "Testing value"
def testChildAlteredState(self):
"""
Object should change state when a child object changes state.
"""
assert self.conf.altered() == False
- self.conf.common.LIVE_SPAM = "eggs"
+ self.conf.common.LH_SPAM = "eggs"
assert self.conf.altered() == True
def testConfLoadResetState(self):
@@ -60,10 +60,10 @@ class TestConfiguration(unittest.TestCase):
Reloading the configuration should reset state.
"""
assert self.conf.altered() == False
- self.conf.common.LIVE_SPAM = "eggs"
+ self.conf.common.LH_SPAM = "eggs"
assert self.conf.altered() == True
self.conf.reload()
- assert not hasattr(self.conf.common, 'LIVE_SPAM')
+ assert not hasattr(self.conf.common, 'LH_SPAM')
assert self.conf.altered() == False
if __name__ == "__main__":
commit ad010a9f083e0e5cf5270f11c35fcfaa1819838b
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date: Mon Jan 14 18:22:24 2008 +0000
Add gitignore.
Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..0d20b64
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+*.pyc
--
GUI front-end for Debian Live.
More information about the debian-live-changes
mailing list