MagicMirror² v2.12.0 is available! For more information about this release, check out this topic.

Update to v2.9.0 fail



  • As I get informed about new update available on my MagicMirror² I tried

    git pull && npm install
    

    and got

    Aktualisiere a31546b..500147e
    error: Ihre lokalen Änderungen in den folgenden Dateien würden durch den Merge
    überschrieben werden:
            package-lock.json
    Bitte committen oder stashen Sie Ihre Änderungen, bevor Sie mergen.
    Abbruch
    

    Sorry for german error message 😉 which mean I have to commit my? changes on package-lock.json
    I don’t know what and how and even why 😱
    I have no clue about any change I made on package-lock.json

    @sdetweil I saw your post link text but don’t know if this is for Raspberry alsow and if I should try this.

    I’m a little afraid killing my installation.





  • I tried u script but get further message update available even I restarted mm

    pm2 start mm
    

    the upgrade log here

    
    Upgrade started - Mi Okt 16 14:38:38 CEST 2019
    doing test run = true
    downloading dumpactivemodules script
    
    saving custom.css
    not english or locale not set, set git alias
    remote name = origin
    upgrading from version 2.8.0 to 2.9.0
    fetching latest revisions
    current branch = master
    no files different from github version
    test merge result rc='' , if empty, no conflicts
    skipping merge, only test run
    
    processing dependency changes for active modules with package.json files
    processing for module MMM-Carousel please wait
    ----------------------------------
    skipped processing for MMM-Carousel, doing test run
    processing complete for module MMM-Carousel
    processing for module MMM-PublicTransportHafas please wait
    ----------------------------------
    skipped processing for MMM-PublicTransportHafas, doing test run
    processing complete for module MMM-PublicTransportHafas
    processing for module MMM-PublicTransportHafas please wait
    ----------------------------------
    skipped processing for MMM-PublicTransportHafas, doing test run
    processing complete for module MMM-PublicTransportHafas
    processing for module MMM-PublicTransportHafas please wait
    ----------------------------------
    skipped processing for MMM-PublicTransportHafas, doing test run
    processing complete for module MMM-PublicTransportHafas
    restoring custom.css
    removing git alias
    Upgrade ended - Mi Okt 16 14:38:45 CEST 2019
    
    Upgrade started - Mi Okt 16 14:41:56 CEST 2019
    user requested to apply changes
    doing test run = false
    
    saving custom.css
    not english or locale not set, set git alias
    remote name = origin
    upgrading from version 2.8.0 to 2.9.0
    fetching latest revisions
    current branch = master
    no files different from github version
    test merge result rc='' , if empty, no conflicts
    executing merge, apply specified
    merge result rc= 1
     error: Ihre lokalen Änderungen in den folgenden Dateien würden durch den Merge überschrieben werden: 	package-lock.json Bitte committen oder stashen Sie Ihre Änderungen, bevor Sie mergen. Abbruch Aktualisiere a31546b..500147e
    there were merge errors
    you should examine and resolve them
    using the command git log --oneline --decorate
    a31546b (grafted, HEAD -> master, tag: v2.8.0) Merge pull request #1717 from MichMich/develop
    restoring custom.css
    removing git alias
    Upgrade ended - Mi Okt 16 14:41:58 CEST 2019
    


  • @bdream fun… can u show me the results of

    alias git='LANGUAGE=en_US.UTF-8 git'
    git status
    unalias git >/dev/null
    

    thanks…

    I had also changed the messaging to english… surprised at the german message…



  • @sdetweil seems there is a deeper problem!?!

    pi@MagicMirror:~ $ git status
    fatal: not a git repository (or any of the parent directories): .git
    

    what does this mean please?

    unalias git >/dev/null
    


  • @bdream u need to be in the MagicMirror folder to do those commands

    i set an alias for git to use english messages
    then execute a git command, with english output
    then remove the alias, so back to your configured language



  • @sdetweil SORRY!

    pi@MagicMirror:~/MagicMirror $  git status
    On branch master
    Your branch is behind 'origin/master' by 2715 commits, and can be fast-forwarded.
      (use "git pull" to update your local branch)
    
    Changes not staged for commit:
      (use "git add ..." to update what will be committed)
      (use "git checkout -- ..." to discard changes in working directory)
    
            modified:   css/custom.css
            modified:   package-lock.json
    
    Untracked files:
      (use "git add ..." to include in what will be committed)
    
            core
            installers/dumpactivemodules.js
            installers/pm2_MagicMirror_new.json
            mm.sh
            nohup.out
    
    no changes added to commit (use "git add" and/or "git commit -a")
    


  • @bdream weird… says code should handle it

    try this

    alias
    alias git='LANGUAGE=en_US.UTF-8 git'
    git status | grep modified | awk -F: '{print $2}'
    unalias git >/dev/null
    

    thanks



  • @sdetweil

    pi@MagicMirror:~/MagicMirror $  alias
    alias egrep='egrep --color=auto'
    alias fgrep='fgrep --color=auto'
    alias git='LANGUAGE=en_US.UTF-8 git'
    alias grep='grep --color=auto'
    alias ls='ls --color=auto'
    pi@MagicMirror:~/MagicMirror $  alias git='LANGUAGE=en_US.UTF-8 git'
    pi@MagicMirror:~/MagicMirror $  git status | grep modified | awk -F: '{print $2}'
       css/custom.css
       package-lock.json
    pi@MagicMirror:~/MagicMirror $  unalias git >/dev/null
    
    


  • @bdream weird…

    can u try the script again? i am recording the output of the git status command, manually it detects the file


Log in to reply