Skip to contentSkip to conversation

support/scripts/pkg-stats: add tilde '~' expansion for pathes

PATCH New Heiko Thiery 2 participants 4 messages Mar 7, 2020 – Apr 12, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 support/scripts/pkg-stats: add tilde '~' expansion for pathes

The script arguments 'nvd-path', 'json' and 'html' currently does not allow to have '~' in path for user home directory. With this patch this '~' is expanded to the real user home directory.

---
 support/scripts/pkg-stats | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
support/scripts/pkg-stats +7 -3
index 8a67e509e1..bfe3a3f8d4 100755
@@ -861,12 +861,16 @@ def dump_json(packages, stats, date, commit, output):
         f.write('\n')
 
 
+def resolvepath(path):
+        return os.path.abspath(os.path.expanduser(path))
+
+
 def parse_args():
     parser = argparse.ArgumentParser()
     output = parser.add_argument_group('output', 'Output file(s)')
-    output.add_argument('--html', dest='html', action='store',
+    output.add_argument('--html', dest='html', type=resolvepath,
                         help='HTML output file')
-    output.add_argument('--json', dest='json', action='store',
+    output.add_argument('--json', dest='json', type=resolvepath,
                         help='JSON output file')
     packages = parser.add_mutually_exclusive_group()
     packages.add_argument('-n', dest='npackages', type=int, action='store',
@@ -874,7 +878,7 @@ def parse_args():
     packages.add_argument('-p', dest='packages', action='store',
                           help='List of packages (comma separated)')
     parser.add_argument('--nvd-path', dest='nvd_path',
-                        help='Path to the local NVD database')
+                        help='Path to the local NVD database', type=resolvepath)
     args = parser.parse_args()
     if not args.html and not args.json:
         parser.error('at least one of --html or --json (or both) is required')
Signature · 1 line
2.20.1
#1 lore raw

PATCH 1/1 support/scripts/pkg-stats: add tilde '~' expansion for pathes

Quoted 5 lines · On Sat, 7 Mar 2020 11:37:05 +0100 Heiko Thiery <[email protected]> wrote:

The script arguments 'nvd-path', 'json' and 'html' currently does not allow to have '~' in path for user home directory. With this patch this '~' is expanded to the real user home directory.

Isn't ~ supposed to be expanded by your shell before calling pkg-stats ? Here, pkg-stats --html ~/toto.html works perfectly fine without your patch.

Best regards,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#2 lore raw

PATCH 1/1 support/scripts/pkg-stats: add tilde '~' expansion for pathes

Hi Thomas,

Am Sa., 7. M?rz 2020 um 15:56 Uhr schrieb Thomas Petazzoni <[email protected]>:

Quoted 8 lines
Quoted 4 lines · On Sat, 7 Mar 2020 11:37:05 +0100 Heiko Thiery <[email protected]> wrote:

The script arguments 'nvd-path', 'json' and 'html' currently does not allow to have '~' in path for user home directory. With this patch this '~' is expanded to the real user home directory.

Quoted 6 lines
Quoted 1 line

Isn't ~ supposed to be expanded by your shell before calling pkg-stats ? Here, pkg-stats --html ~/toto.html works perfectly fine without your patch.

Indeed I didn't thought about that and you're right the shell should expand that. But I saw that it was not.

I rechecked that and found out that there is a difference between setting the argument of the option with or without a '='.

Without '=' the '~' is expanded by the shell (pkg-stats --html ~/out.html). Wit '=' the '~' is not expanded by the shell (pkg-stats --html=~/out.html).

Quoted 7 lines

Best regards,

Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

Heiko

#3 lore raw

PATCH 1/1 support/scripts/pkg-stats: add tilde '~' expansion for pathes

In reply to Heiko Thiery
Quoted 8 lines · On Sat, 7 Mar 2020 11:37:05 +0100 Heiko Thiery <[email protected]> wrote:

The script arguments 'nvd-path', 'json' and 'html' currently does not allow to have '~' in path for user home directory. With this patch this '~' is expanded to the real user home directory.

---
 support/scripts/pkg-stats | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

Applied to master with an improved commit log to explain the difference between --html=~/foo and --html ~/foo.

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com