[Sugar-devel] [PATCH] Bundlebuilder: don't fail to package if git is not installed, OLPC #11341

[Sascha Silbe]

Excerpts from from = Simon Schampijer's message of 2011-11-10 09:44:34 +0100:

[src/sugar/activity/bundlebuilder.py: _get_files_in_git()]
> +        except OSError:
> +            logging.warn('XOPackager, git is not installed, ' \
> +                             'fall back to filtered list')

           logging.warn('XOPackager: git is not installed, falling back to'
                        ' filtered list')

With "XOPackager," it sounded like you're addressing someone called
XOPackager. Whitespace was off (proportional font?), explicit line
continuation unnecessary.


[...]
>          if git_ls.returncode:
> -            # Fall back to filtered list
> +            logging.warn('XOPackager, this is not a git repository, ' \
> +                             'fall back to filtered list')

Ditto:

            logging.warn('XOPackager: this is not a git repository, falling'
                         ' back to filtered list')


[get_files()]
> +        except OSError:
> +            logging.warn('SourcePackager, git is not installed, ' \
> +                             'fall back to filtered list')

Ditto:

            logging.warn('SourcePackager: git is not installed, falling back'
                         ' to filtered list')

[...]
>          if git_ls.returncode:
> -            # Fall back to filtered list
> +            logging.warn('SourcePackager, this is not a git repository, ' \
> +                             'fall back to filtered list')

Ditto:

            logging.warn('SourcePackager: this is not a git repository,'
                         ' falling back to filtered list')


Acked-by: Sascha Silbe <silbe at activitycentral.com>

You might want to fix the author name. ;)

Sascha

-- 
http://sascha.silbe.org/
http://www.infra-silbe.de/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 490 bytes
Desc: not available
URL: <http://lists.sugarlabs.org/archive/sugar-devel/attachments/20111128/59d6828d/attachment.pgp>