From 7bb9c84863631006f4a464288dfa1b7de6b28cab Mon Sep 17 00:00:00 2001 From: fonfon Date: Wed, 3 Sep 2014 04:43:08 +0200 Subject: [PATCH] Fixed ImportError when running plinth as daemonized python package --- HACKING | 14 +++++--------- plinth/__init__.py | 2 ++ plinth/modules/first_boot/__init__.py | 2 +- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/HACKING b/HACKING index 6dcc5321d..5d178d951 100644 --- a/HACKING +++ b/HACKING @@ -21,20 +21,16 @@ $ sudo python -m plinth --no-daemon --debug In this mode, Plinth runs in working directory without need for - installation. It uses a different config file (plinth.conf in working - directory) instead of the regular config file (/etc/plinth/plinth.conf). It - creates all that data and runtime files in data/var/*. To make Plinth - pickup the config file in working directory, simply delete - /etc/plinth/plinth.config. + installation. It uses the plinth.conf config file in the working + directory if no regular config file (/etc/plinth/plinth.conf) is found. + It creates all that data and runtime files in data/var/*. *Note:* This mode is supported only in a limited manner. The following are the unknown issues with it: - 1. It does not work without the --debug and --no-daemon flags. + 1. Help pages are also not built. Run 'make -C doc' manaully. - 2. Help pages are also not built. Run 'make -C doc' manaully. - - 3. Actions do not work when running as normal user without 'sudo' prefix. + 2. Actions do not work when running as normal user without 'sudo' prefix. You need to add 'actions' directory to be allowed for 'sudo' commands. See data/etc/sudoers.d/plinth for a hint. diff --git a/plinth/__init__.py b/plinth/__init__.py index 94f997920..6dfe195cb 100644 --- a/plinth/__init__.py +++ b/plinth/__init__.py @@ -19,4 +19,6 @@ Plinth package init file """ +from . import context_processors + __version__ = '0.3.2' diff --git a/plinth/modules/first_boot/__init__.py b/plinth/modules/first_boot/__init__.py index b9a2a74f5..fa89e3444 100644 --- a/plinth/modules/first_boot/__init__.py +++ b/plinth/modules/first_boot/__init__.py @@ -19,6 +19,6 @@ Plinth module for first boot wizard """ -from . import first_boot +from . import first_boot, middleware __all__ = ['first_boot']