Patchwork [U-Boot,1/2] patman: Change the location of the config file

login
register
mail settings
Submitter Vikram Narayanan
Date May 8, 2012, 6:10 p.m.
Message ID <4FA961AE.6080906@gmail.com>
Download mbox | patch
Permalink /patch/157765/
State Changes Requested
Headers show

Comments

Vikram Narayanan - May 8, 2012, 6:10 p.m.
Move the config file from ~/.config/patman to ~/.patman
as it is more appropriate to have it there.

Signed-off-by: Vikram Narayanan <vikram186@gmail.com>
Cc: Simon Glass <sjg@chromium.org>
---
 tools/patman/settings.py |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
Wolfgang Denk - May 22, 2012, 4:03 p.m.
Dear Vikram Narayanan,

In message <4FA961AE.6080906@gmail.com> you wrote:
> Move the config file from ~/.config/patman to ~/.patman
> as it is more appropriate to have it there.
> 
> Signed-off-by: Vikram Narayanan <vikram186@gmail.com>
> Cc: Simon Glass <sjg@chromium.org>
> ---
>  tools/patman/settings.py |    8 ++++----
>  1 files changed, 4 insertions(+), 4 deletions(-)

Sorry, this patch does not apply:

Applying patch #157765 to current directory
Description: [U-Boot,1/2] patman: Change the location of the config
file
Applying: patman: Change the location of the config file
fatal: sha1 information is lacking or useless
(tools/patman/settings.py).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 patman: Change the location of the config file


Please fix and resubmit.

Best regards,

Wolfgang Denk
Simon Glass - May 22, 2012, 4:57 p.m.
Hi Vikram,

On Tue, May 8, 2012 at 11:10 AM, Vikram Narayanan <vikram186@gmail.com>wrote:

> Move the config file from ~/.config/patman to ~/.patman
> as it is more appropriate to have it there.
>

Sorry for the silence, am a little tied up.


>
> Signed-off-by: Vikram Narayanan <vikram186@gmail.com>
> Cc: Simon Glass <sjg@chromium.org>
>

Can you please also change the README? I see you do it later, but better
done here.


> ---
>  tools/patman/settings.py |    8 ++++----
>  1 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/tools/patman/settings.py b/tools/patman/settings.py
> index 9b7e75d..4dda17b 100644
> --- a/tools/patman/settings.py
> +++ b/tools/patman/settings.py
> @@ -62,10 +62,10 @@ def ReadGitAliases(fname):
>     fd.close()
>
>  def CreatePatmanConfigFile(config_fname):
> -    """Creates a config file under $(HOME)/.config/ if it can't find one.
> +    """Creates a config file under $(HOME)/.patman if it can't find one.
>
>     Args:
> -        config_fname: Default config filename i.e., $(HOME)/.config/patman
> +        config_fname: Default config filename i.e., $(HOME)/.patman
>
>     Returns:
>         None
> @@ -96,10 +96,10 @@ def Setup(config_fname=''):
>     """
>     settings = ConfigParser.SafeConfigParser()
>     if config_fname == '':
> -        config_fname = '%s/.config/patman' % os.getenv('HOME')
> +        config_fname = '%s/.patman' % os.getenv('HOME')
>
>     if not os.path.exists(config_fname):
> -        print "No config file found under ~/.config/\nCreating one...\n"
> +        print "No config file found ~/.patman\nCreating one...\n"
>         CreatePatmanConfigFile(config_fname)
>
>     settings.read(config_fname)
> --
> 1.7.4.1
>
> Regards,
Simon

Patch

diff --git a/tools/patman/settings.py b/tools/patman/settings.py
index 9b7e75d..4dda17b 100644
--- a/tools/patman/settings.py
+++ b/tools/patman/settings.py
@@ -62,10 +62,10 @@  def ReadGitAliases(fname):
     fd.close()
 
 def CreatePatmanConfigFile(config_fname):
-    """Creates a config file under $(HOME)/.config/ if it can't find one.
+    """Creates a config file under $(HOME)/.patman if it can't find one.
 
     Args:
-        config_fname: Default config filename i.e., $(HOME)/.config/patman
+        config_fname: Default config filename i.e., $(HOME)/.patman
 
     Returns:
         None
@@ -96,10 +96,10 @@  def Setup(config_fname=''):
     """
     settings = ConfigParser.SafeConfigParser()
     if config_fname == '':
-        config_fname = '%s/.config/patman' % os.getenv('HOME')
+        config_fname = '%s/.patman' % os.getenv('HOME')
 
     if not os.path.exists(config_fname):
-        print "No config file found under ~/.config/\nCreating one...\n"
+        print "No config file found ~/.patman\nCreating one...\n"
         CreatePatmanConfigFile(config_fname)
 
     settings.read(config_fname)