This is an automated email from the git hooks/post-receive script. pere pushed a commit to branch master in repository creepy.
commit ef9048225fa05f7153536f8ec14dc489d31b347e Author: Petter Reinholdtsen <p...@hungry.com> Date: Sun Nov 16 23:49:17 2014 +0100 Fix typo in plugin patch. --- debian/patches/02-plugin-directory.patch | 44 +++++++++++++++++--------------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/debian/patches/02-plugin-directory.patch b/debian/patches/02-plugin-directory.patch index 390307f..32da116 100644 --- a/debian/patches/02-plugin-directory.patch +++ b/debian/patches/02-plugin-directory.patch @@ -8,8 +8,8 @@ Last-Update: 2014-11-16 Index: creepy/creepy/CreepyMain.py =================================================================== ---- creepy.orig/creepy/CreepyMain.py 2014-11-16 23:27:33.471956217 +0100 -+++ creepy/creepy/CreepyMain.py 2014-11-16 23:27:34.563969788 +0100 +--- creepy.orig/creepy/CreepyMain.py 2014-11-16 23:41:54.717658874 +0100 ++++ creepy/creepy/CreepyMain.py 2014-11-16 23:46:40.944542917 +0100 @@ -58,7 +58,7 @@ def run(self): pluginManager = PluginManagerSingleton.get() @@ -21,8 +21,8 @@ Index: creepy/creepy/CreepyMain.py locationsList = [] Index: creepy/creepy/utilities/GeneralUtilities.py =================================================================== ---- creepy.orig/creepy/utilities/GeneralUtilities.py 2014-11-16 23:27:33.475956275 +0100 -+++ creepy/creepy/utilities/GeneralUtilities.py 2014-11-16 23:27:34.563969788 +0100 +--- creepy.orig/creepy/utilities/GeneralUtilities.py 2014-11-16 23:41:54.721658923 +0100 ++++ creepy/creepy/utilities/GeneralUtilities.py 2014-11-16 23:46:40.944542917 +0100 @@ -21,6 +21,9 @@ def reportProblem(): webbrowser.open_new_tab('https://github.com/ilektrojohn/creepy/issues') @@ -35,8 +35,8 @@ Index: creepy/creepy/utilities/GeneralUtilities.py Calculate the great circle distance between two points Index: creepy/creepy/components/PluginsConfigurationDialog.py =================================================================== ---- creepy.orig/creepy/components/PluginsConfigurationDialog.py 2014-11-16 23:27:14.351718093 +0100 -+++ creepy/creepy/components/PluginsConfigurationDialog.py 2014-11-16 23:27:34.563969788 +0100 +--- creepy.orig/creepy/components/PluginsConfigurationDialog.py 2014-11-16 23:28:14.148459890 +0100 ++++ creepy/creepy/components/PluginsConfigurationDialog.py 2014-11-16 23:41:54.737659090 +0100 @@ -12,7 +12,7 @@ # Load the installed plugins and read their metadata self.PluginManager = PluginManagerSingleton.get() @@ -48,8 +48,8 @@ Index: creepy/creepy/components/PluginsConfigurationDialog.py Index: creepy/creepy/components/PersonProjectWizard.py =================================================================== ---- creepy.orig/creepy/components/PersonProjectWizard.py 2014-11-16 23:27:14.351718093 +0100 -+++ creepy/creepy/components/PersonProjectWizard.py 2014-11-16 23:27:34.563969788 +0100 +--- creepy.orig/creepy/components/PersonProjectWizard.py 2014-11-16 23:28:14.148459890 +0100 ++++ creepy/creepy/components/PersonProjectWizard.py 2014-11-16 23:41:54.737659090 +0100 @@ -102,7 +102,7 @@ ''' self.PluginManager = PluginManagerSingleton.get() @@ -61,19 +61,23 @@ Index: creepy/creepy/components/PersonProjectWizard.py pluginList = sorted(self.PluginManager.getAllPlugins(), key=lambda x: x.name) Index: creepy/creepy/models/InputPlugin.py =================================================================== ---- creepy.orig/creepy/models/InputPlugin.py 2014-11-16 23:27:33.471956217 +0100 -+++ creepy/creepy/models/InputPlugin.py 2014-11-16 23:28:00.372289747 +0100 -@@ -39,17 +39,17 @@ +--- creepy.orig/creepy/models/InputPlugin.py 2014-11-16 23:41:54.717658874 +0100 ++++ creepy/creepy/models/InputPlugin.py 2014-11-16 23:48:10.809427974 +0100 +@@ -39,17 +39,21 @@ def returnPersonalInformation(self, search_params): pass - def getConfigObj(self): - config_filename = self.name+".conf" - config_file = os.path.join(os.getcwdu(),'plugins', self.name, config_filename) ++ + def getPluginDir(self): ++ """FIXME Figure out way to always set it to the directory where the plugin code was found""" + return os.path.join('/usr/share/creepy/plugins', self.name) + -+ def getConfigObj(self, config_filename = self.name+".conf"): ++ def getConfigObj(self, config_filename = None): ++ if config_filename is None: ++ config_filename = self.name+".conf" + config_file = os.path.join(self.getPluginDir(), config_filename) config = ConfigObj(infile=config_file) config.create_empty=False @@ -89,7 +93,7 @@ Index: creepy/creepy/models/InputPlugin.py try: options = config[category] except Exception,err: -@@ -59,10 +59,7 @@ +@@ -59,10 +63,7 @@ return config,options def saveConfiguration(self, new_config): @@ -101,7 +105,7 @@ Index: creepy/creepy/models/InputPlugin.py try: config['string_options'] = new_config['string_options'] config['boolean_options'] = new_config['boolean_options'] -@@ -72,10 +69,7 @@ +@@ -72,10 +73,7 @@ logger.exception(err) def loadSearchConfigurationParameters(self): @@ -115,8 +119,8 @@ Index: creepy/creepy/models/InputPlugin.py except Exception, err: Index: creepy/creepy/plugins/flickr/flickr.py =================================================================== ---- creepy.orig/creepy/plugins/flickr/flickr.py 2014-11-16 23:27:33.471956217 +0100 -+++ creepy/creepy/plugins/flickr/flickr.py 2014-11-16 23:28:00.372289747 +0100 +--- creepy.orig/creepy/plugins/flickr/flickr.py 2014-11-16 23:41:54.717658874 +0100 ++++ creepy/creepy/plugins/flickr/flickr.py 2014-11-16 23:41:54.737659090 +0100 @@ -24,10 +24,7 @@ def __init__(self): @@ -131,8 +135,8 @@ Index: creepy/creepy/plugins/flickr/flickr.py self.labels = labels_config['labels'] Index: creepy/creepy/plugins/instagram/instagram.py =================================================================== ---- creepy.orig/creepy/plugins/instagram/instagram.py 2014-11-16 23:27:33.471956217 +0100 -+++ creepy/creepy/plugins/instagram/instagram.py 2014-11-16 23:28:00.372289747 +0100 +--- creepy.orig/creepy/plugins/instagram/instagram.py 2014-11-16 23:41:54.717658874 +0100 ++++ creepy/creepy/plugins/instagram/instagram.py 2014-11-16 23:41:54.737659090 +0100 @@ -24,10 +24,7 @@ def __init__(self): @@ -147,8 +151,8 @@ Index: creepy/creepy/plugins/instagram/instagram.py self.labels = labels_config['labels'] Index: creepy/creepy/plugins/twitter/twitter.py =================================================================== ---- creepy.orig/creepy/plugins/twitter/twitter.py 2014-11-16 23:27:33.471956217 +0100 -+++ creepy/creepy/plugins/twitter/twitter.py 2014-11-16 23:28:00.372289747 +0100 +--- creepy.orig/creepy/plugins/twitter/twitter.py 2014-11-16 23:41:54.717658874 +0100 ++++ creepy/creepy/plugins/twitter/twitter.py 2014-11-16 23:41:54.737659090 +0100 @@ -26,10 +26,7 @@ def __init__(self): -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/creepy.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel