Wireshark · Wireshark-commits: [Wireshark-commits] master-1.10 59c96b8: Strip out carriage returns when reading version.conf.

[Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>]

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=59c96b89eb214546093c7acd925eedcbadb920a3
Submitter: Gerald Combs (gerald@xxxxxxxxxxxxx)
Changed: branch: master-1.10
Repository: wireshark

Commits:

59c96b8 by Gerald Combs (gerald@xxxxxxxxxxxxx):

    Strip out carriage returns when reading version.conf.
    
    The input record separator ($/) under Cygwin's Perl appears to be "\n"
    which means that chomp() won't strip out carriage returns. Make sure
    we do that when reading version.conf, otherwise we can end up with
    unexpected behavior.
    
    Check pkg_enable using an integer comparison as an extra level of
    protection.
    
    (We need to handle CRs better in general but for now we need to get
    version stamping working for the next release.)
    
    Change-Id: I19974467d1a7386728b69dca77f74e678d66ca6b
    Reviewed-on: https://code.wireshark.org/review/483
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    (cherry picked from commit d70016fdd64f05093863c7fe66fe4c5f7343d8c0)
    Reviewed-on: https://code.wireshark.org/review/484
    

Actions performed:

    from  b8c1cc0   Update .gitignore to add some Windows specific build stuff to ignore list.
    adds  59c96b8   Strip out carriage returns when reading version.conf.


Summary of changes:
 make-version.pl |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)