Update, merge issue..



  • Ok guys,
    I've tried to do and update
    Stopped service, backed everything up.
    Did a git stash (since I have one line of code changed for alternitive logins)
    Did a git pull and received the fix merge error

    Here is the unmerged section of git status comamnd

    Unmerged paths:
    (use "git add <file>..." to mark resolution)

    both modified:      app.js
    both added:         npm-shrinkwrap.json
    both modified:      package.json
    both modified:      public/language/ar/search.json
    both modified:      public/language/es/user.json
    both modified:      public/language/zh_CN/error.json
    both modified:      public/language/zh_CN/topic.json
    both modified:      src/controllers/accounts.js
    both modified:      src/controllers/index.js
    both modified:      src/database/mongo.js
    both modified:      src/database/redis.js
    

    They don't seem to be plugins more language packs etc. So unsure how to proceed


  • GNU/Linux

    I just did a succesful git pull

    typed /nodebb upgrade

    and I'm still running 0.7.0 dohh


  • Admin

    @tfraley Darn, I didn't anticipate that. Please run this:

    $ git reset --hard origin/v0.7.x
    

    Then you should be good to run ./nodebb upgrade



  • @julian

    Ok this is my output

    thomasfraley@nodebb:~/nodebb$ git reset --hard origin/v0.7.x
    HEAD is now at 8d786a1 0.7.1
    thomasfraley@nodebb:~/nodebb$ ./nodebb upgrade

    module.js:340
    throw err;
    ^
    Error: Cannot find module 'colors'
    at Function.Module._resolveFilename (module.js:338:15)
    at Function.Module._load (module.js:280:25)
    at Module.require (module.js:364:17)
    at require (module.js:380:17)
    at Object.<anonymous> (/home/thomasfraley/nodebb/nodebb:3:14)
    at Module._compile (module.js:456:26)
    at Object.Module._extensions..js (module.js:474:10)
    at Module.load (module.js:356:32)
    at Function.Module._load (module.js:312:12)
    at Function.Module.runMain (module.js:497:10)
    thomasfraley@nodebb:~/nodebb$


  • Admin

    @tfraley Okay, run npm install first, before ./nodebb upgrade



  • @julian

    That seemed to fix the problem, Forum is back up and everything looks good

    Question, the one line of code I stashed. Would it be ok to do a git stash pop to put it back in
    Or should I manually do it? Just unsure if the stash would of stashed other things from before?

    No biggie to add it back manually just wrapping my hand around how everything works ..


  • Admin

    Okay @tfraley @SimonQ, whether you want to execute the following or not is up to you (esp. @tfraley, since your forum is up and running, and you probably don't want to mess around with it)

    Long story short, when I launched v0.7.1, I re-wrote part of the git history, which is a big no-no. I've re-launched it properly now, but you guys have probably reset your working copies to the altered history, so we'll need to fix that.

    Re-run the commands I told you to run earlier. For reference, here they are again:

    $ git checkout v0.7.x  # get to the v0.7.x branch
    $ git fetch  # grab the latest history from GitHub
    $ git reset --hard origin/v0.7.x  # update your local copy to match
    $ npm i  # install any missing dependencies
    $ ./nodebb upgrade  # execute upgrade script
    


  • @julian
    When issuing the "npm i" command i recieved this error
    npm ERR! peerinvalid The package nodebb-theme-vanilla does not satisfy its siblings' peerDependencies requirements!
    npm ERR! peerinvalid Peer nodebb-plugin-spam-be-gone@0.4.1 wants nodebb-theme-vanilla@>=0.0.137
    npm ERR! peerinvalid Peer nodebb-theme-cerulean@0.0.13-2 wants nodebb-theme-vanilla@~0.0.13

    npm ERR! System Linux 3.16.0-28-generic
    npm ERR! command "/usr/bin/nodejs" "/usr/bin/npm" "i"
    npm ERR! cwd /root/nodebb
    npm ERR! node -v v0.10.25
    npm ERR! npm -v 1.4.21
    npm ERR! code EPEERINVALID
    npm ERR!
    npm ERR! Additional logging details can be found in:
    npm ERR! /root/nodebb/npm-debug.log
    npm ERR! not ok code 0

    Would I require to reset all my plugins?


  • Admin

    @MySelfLuls Cerulean is quite out of date, I wouldn't recommend installing it.

    npm unlink nodebb-plugin-cerulean

    Then try again.



  • @julian
    Thanks a lot.
    Btw.
    What was added in the newest update?


  • Admin



  • @julian Followed latest instructions in this post, got this.

    Error: Cannot find module './styles'
    at Function.Module._resolveFilename (module.js:338:15)
    at Function.Module._load (module.js:280:25)
    at Module.require (module.js:364:17)
    at require (module.js:380:17)
    at Object.<anonymous> (/home/errapolis/nodebb/node_modules/colors/lib/colors.js:36:34)
    at Module._compile (module.js:456:26)
    at Object.Module._extensions..js (module.js:474:10)
    at Module.load (module.js:356:32)
    at Function.Module._load (module.js:312:12)
    at Module.require (module.js:364:17)

  • Admin

    Seems like the colors module wasn't installed properly... try reinstalling it? npm i colors



  • I knew i'd encountered a problem like that before, that worked, though subsequently I ran upgrade then it was the same issue with "cookie", then upgrade, then "crc", now "debug". Is there a quicker way to find all those needed if more follow?



  • @julian would this bunch be causing the problem now that the dependency requirements are more strict?

    unmet.JPG

    If so, any hints? Stuck on this:

    Capture.JPG


  • Admin

    @Danny-McWilliams Nope, that should only apply to bundled plugins (mentions, vanilla/lavender/persona theme, markdown, etc).

    If you're getting more of those "cannot find module" errors, then perhaps your dependencies were not completely installed.

    Please run npm install.



  • Ok @julian just did - same result, sadly. unmet dependency list then the same as the second picture.

    Tried to start nodebb, this was in log.

    Capture.JPG


  • GNU/Linux

    @julian i run ./nodebb upgrade after it looks successful npm i command ?

    ./nodebb upgrade
    
    module.js:340
        throw err;
              ^
    Error: Cannot find module 'ini'
        at Function.Module._resolveFilename (module.js:338:15)
        at Function.Module._load (module.js:280:25)
        at Module.require (module.js:364:17)
        at require (module.js:380:17)
        at Object.<anonymous> (/root/nodebb/node_modules/npm/node_modules/config-chain/index.js:4:11)
        at Module._compile (module.js:456:26)
        at Object.Module._extensions..js (module.js:474:10)
        at Module.load (module.js:356:32)
        at Function.Module._load (module.js:312:12)
        at Module.require (module.js:364:17)
    
    21/7 20:21 [25890] - error: Error: Cannot find module './build/Release/magic'
        at Function.Module._resolveFilename (module.js:338:15)
        at Function.Module._load (module.js:280:25)
        at Module.require (module.js:364:17)
        at require (module.js:380:17)
        at Object.<anonymous> (/root/nodebb/node_modules/mmmagic/index.js:3:13)
        at Module._compile (module.js:456:26)
        at Object.Module._extensions..js (module.js:474:10)
        at Module.load (module.js:356:32)
        at Function.Module._load (module.js:312:12)
        at Module.require (module.js:364:17)
    Error: Cannot find module './build/Release/magic'
        at Function.Module._resolveFilename (module.js:338:15)
        at Function.Module._load (module.js:280:25)
        at Module.require (module.js:364:17)
        at require (module.js:380:17)
        at Object.<anonymous> (/root/nodebb/node_modules/mmmagic/index.js:3:13)
        at Module._compile (module.js:456:26)
        at Object.Module._extensions..js (module.js:474:10)
        at Module.load (module.js:356:32)
        at Function.Module._load (module.js:312:12)
        at Module.require (module.js:364:17)
    
    module.js:340
        throw err;
        ^
    Error: Cannot find module './build/Release/magic'
        at Function.Module._resolveFilename (module.js:338:15)
        at Function.Module._load (module.js:280:25)
        at Module.require (module.js:364:17)
        at require (module.js:380:17)
        at Object.<anonymous> (/root/nodebb/node_modules/mmmagic/index.js:3:13)
        at Module._compile (module.js:456:26)
        at Object.Module._extensions..js (module.js:474:10)
        at Module.load (module.js:356:32)
        at Function.Module._load (module.js:312:12)
        at Module.require (module.js:364:17)
    

  • GNU/Linux

    npm i is your phriend

    NodeBB Upgrade Complete!


  • Community Rep

    @Danny-McWilliams said:

    Ok @julian just did - same result, sadly. unmet dependency list then the same as the second picture.

    Tried to start nodebb, this was in log.

    Capture.JPG

    Usually when I get issues like this, I have to do an npm cache clean and then an npm install or npm rebuild


Log in to reply
 


Looks like your connection to NodeBB was lost, please wait while we try to reconnect.