diff options
Diffstat (limited to 'scripts/lib/recipetool/create.py')
| -rw-r--r-- | scripts/lib/recipetool/create.py | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/scripts/lib/recipetool/create.py b/scripts/lib/recipetool/create.py index d427d32062..c1819b6c66 100644 --- a/scripts/lib/recipetool/create.py +++ b/scripts/lib/recipetool/create.py | |||
| @@ -32,6 +32,18 @@ logger = logging.getLogger('recipetool') | |||
| 32 | tinfoil = None | 32 | tinfoil = None |
| 33 | plugins = None | 33 | plugins = None |
| 34 | 34 | ||
| 35 | def log_error_cond(message, debugonly): | ||
| 36 | if debugonly: | ||
| 37 | logger.debug(message) | ||
| 38 | else: | ||
| 39 | logger.error(message) | ||
| 40 | |||
| 41 | def log_info_cond(message, debugonly): | ||
| 42 | if debugonly: | ||
| 43 | logger.debug(message) | ||
| 44 | else: | ||
| 45 | logger.info(message) | ||
| 46 | |||
| 35 | def plugin_init(pluginlist): | 47 | def plugin_init(pluginlist): |
| 36 | # Take a reference to the list so we can use it later | 48 | # Take a reference to the list so we can use it later |
| 37 | global plugins | 49 | global plugins |
| @@ -406,7 +418,7 @@ def create_recipe(args): | |||
| 406 | srctree = tempsrc | 418 | srctree = tempsrc |
| 407 | if fetchuri.startswith('npm://'): | 419 | if fetchuri.startswith('npm://'): |
| 408 | # Check if npm is available | 420 | # Check if npm is available |
| 409 | check_npm(tinfoil.config_data) | 421 | check_npm(tinfoil.config_data, args.devtool) |
| 410 | logger.info('Fetching %s...' % srcuri) | 422 | logger.info('Fetching %s...' % srcuri) |
| 411 | try: | 423 | try: |
| 412 | checksums = scriptutils.fetch_uri(tinfoil.config_data, fetchuri, srctree, srcrev) | 424 | checksums = scriptutils.fetch_uri(tinfoil.config_data, fetchuri, srctree, srcrev) |
| @@ -640,7 +652,7 @@ def create_recipe(args): | |||
| 640 | 652 | ||
| 641 | if not outfile: | 653 | if not outfile: |
| 642 | if not pn: | 654 | if not pn: |
| 643 | logger.error('Unable to determine short program name from source tree - please specify name with -N/--name or output file name with -o/--outfile') | 655 | log_error_cond('Unable to determine short program name from source tree - please specify name with -N/--name or output file name with -o/--outfile', args.devtool) |
| 644 | # devtool looks for this specific exit code, so don't change it | 656 | # devtool looks for this specific exit code, so don't change it |
| 645 | sys.exit(15) | 657 | sys.exit(15) |
| 646 | else: | 658 | else: |
| @@ -736,7 +748,7 @@ def create_recipe(args): | |||
| 736 | shutil.move(srctree, args.extract_to) | 748 | shutil.move(srctree, args.extract_to) |
| 737 | if tempsrc == srctree: | 749 | if tempsrc == srctree: |
| 738 | tempsrc = None | 750 | tempsrc = None |
| 739 | logger.info('Source extracted to %s' % args.extract_to) | 751 | log_info_cond('Source extracted to %s' % args.extract_to, args.devtool) |
| 740 | 752 | ||
| 741 | if outfile == '-': | 753 | if outfile == '-': |
| 742 | sys.stdout.write('\n'.join(outlines) + '\n') | 754 | sys.stdout.write('\n'.join(outlines) + '\n') |
| @@ -749,7 +761,7 @@ def create_recipe(args): | |||
| 749 | continue | 761 | continue |
| 750 | f.write('%s\n' % line) | 762 | f.write('%s\n' % line) |
| 751 | lastline = line | 763 | lastline = line |
| 752 | logger.info('Recipe %s has been created; further editing may be required to make it fully functional' % outfile) | 764 | log_info_cond('Recipe %s has been created; further editing may be required to make it fully functional' % outfile, args.devtool) |
| 753 | 765 | ||
| 754 | if tempsrc: | 766 | if tempsrc: |
| 755 | if args.keep_temp: | 767 | if args.keep_temp: |
| @@ -1073,9 +1085,9 @@ def convert_rpm_xml(xmlfile): | |||
| 1073 | return values | 1085 | return values |
| 1074 | 1086 | ||
| 1075 | 1087 | ||
| 1076 | def check_npm(d): | 1088 | def check_npm(d, debugonly=False): |
| 1077 | if not os.path.exists(os.path.join(d.getVar('STAGING_BINDIR_NATIVE', True), 'npm')): | 1089 | if not os.path.exists(os.path.join(d.getVar('STAGING_BINDIR_NATIVE', True), 'npm')): |
| 1078 | logger.error('npm required to process specified source, but npm is not available - you need to build nodejs-native first') | 1090 | log_error_cond('npm required to process specified source, but npm is not available - you need to build nodejs-native first', debugonly) |
| 1079 | sys.exit(14) | 1091 | sys.exit(14) |
| 1080 | 1092 | ||
| 1081 | def register_commands(subparsers): | 1093 | def register_commands(subparsers): |
| @@ -1093,5 +1105,6 @@ def register_commands(subparsers): | |||
| 1093 | parser_create.add_argument('--src-subdir', help='Specify subdirectory within source tree to use', metavar='SUBDIR') | 1105 | parser_create.add_argument('--src-subdir', help='Specify subdirectory within source tree to use', metavar='SUBDIR') |
| 1094 | parser_create.add_argument('-a', '--autorev', help='When fetching from a git repository, set SRCREV in the recipe to a floating revision instead of fixed', action="store_true") | 1106 | parser_create.add_argument('-a', '--autorev', help='When fetching from a git repository, set SRCREV in the recipe to a floating revision instead of fixed', action="store_true") |
| 1095 | parser_create.add_argument('--keep-temp', action="store_true", help='Keep temporary directory (for debugging)') | 1107 | parser_create.add_argument('--keep-temp', action="store_true", help='Keep temporary directory (for debugging)') |
| 1108 | parser_create.add_argument('--devtool', action="store_true", help=argparse.SUPPRESS) | ||
| 1096 | parser_create.set_defaults(func=create_recipe) | 1109 | parser_create.set_defaults(func=create_recipe) |
| 1097 | 1110 | ||
