Skip to content
Snippets Groups Projects
Select Git revision
  • master default protected
  • v17.01.1
  • v17.01.0
  • v17.01.0-rc2
  • v17.01.0-rc1
  • reboot
6 results
Search by author
  • Any Author
0 authors
  1. Jan 08, 2015
  3. Dec 13, 2014
  5. Dec 12, 2014
  7. Dec 10, 2014
  9. Dec 07, 2014
  11. Nov 28, 2014
  13. Nov 24, 2014
  15. Nov 14, 2014
  17. Oct 26, 2014
  19. Oct 14, 2014
    • John Crispin's avatar
      scripts: fix wrong usage of '==' operator · 20940138
      John Crispin authored 
      
[base-files] shell-scripting: fix wrong usage of '==' operator

normally the '==' is used for invoking a regex parser and is a bashism.
all of the fixes just want to compare a string. the used busybox-ash
will silently "ignore" this mistake, but make it portable/clean at least.

this patch does not change the behavior/logic of the scripts.

Signed-off-by: default avatarBastian Bittorf <bittorf@bluebottle.com>

SVN-Revision: 42911
      20940138
  21. Oct 13, 2014
    • John Crispin's avatar
      scripts/feeds: handle missing/broken feeds better · 590b855c
      John Crispin authored 
      pts/feeds update -a" can fail rather silently for feeds using git, as
the script does not pause when updating a feed fails. Instead it prints the
error message and calmly continues to the next feed. It is very easy to
overlook update errors with the feeds updated first, as their text scrolls
rapidly away from the screen.

This behaviour has not been a big problem with svn feeds, as svn update stops
with a conflict message and interactively forces the user to resolve or
postpone the conflict. In any case the svn error is noticed by the user.

Majority of the feeds use now git, so this silent failure can affect users
doing private builds in an increasing amount.

Below is an example of update failing and script continuing:

perus@v1404:/Openwrt/barrier$ ./scripts/feeds update -a
Updating feed 'packages' from
'https://github.com/openwrt/packages.git;for-14.07' ...
remote: Counting objects: 17, done.
remote: Compressing objects: 100% (15/15), done.
remote: Total 17 (delta 10), reused 8 (delta 1)
Unpacking objects: 100% (17/17), done.
 From https://github.com/openwrt/packages
62031da..dc26009  for-14.07  -> origin/for-14.07
Updating 62031da..dc26009
error: Your local changes to the following files would be overwritten by merge:
utils/collectd/Makefile
Please, commit your changes or stash them before you can merge.
Aborting
failed.
Updating feed 'luci' from 'http://git.openwrt.org/project/luci.git;luci-0.12' ...
Already up-to-date.
Create index file './feeds/luci.index'
Updating feed 'routing' from
'https://github.com/openwrt-routing/packages.git;for-14.07' ...
...

The script prints "failed.", but does not break the updating process. The
"update_feed" function returns an error code 1, but that value is not checked
in the "update" function, which continues to the next feed.
Return 1 as error:
​https://dev.openwrt.org/browser/trunk/scripts/feeds#L547
Call to update_feed without any error monitoring:
​https://dev.openwrt.org/browser/trunk/scripts/feeds#L585



The included patch makes the feeds script to stop updating after failing to
update a feed.

The script continues to the refresh_config step despite a possible failure in
updating, so the stopping action just prevents the other feeds from updating
and makes the error more clearly visible.

Signed-off-by: default avatarHannu Nyman <hannu.nyman@iki.fi>

SVN-Revision: 42891
      590b855c
  23. Oct 08, 2014
  25. Oct 05, 2014
  27. Sep 23, 2014
  29. Sep 18, 2014
  31. Aug 05, 2014
  33. Jul 20, 2014
  35. Jul 04, 2014
  37. Jun 30, 2014
  39. Jun 29, 2014
  41. Jun 27, 2014
  43. Jun 26, 2014
  45. Jun 12, 2014
  47. Jun 11, 2014
  49. Jun 02, 2014
  51. Jun 01, 2014
  53. Mar 13, 2014
  55. Mar 10, 2014
  57. Jan 19, 2014
  59. Dec 13, 2013
  61. Nov 22, 2013
  63. Nov 19, 2013
  65. Oct 28, 2013
  67. Oct 17, 2013