dbwebb upload - local changes overwritten (med sudo)

  • Författare
  • Meddelande

Anders Johansson

html-kodare

  • Inlägg: 13
  • Blev medlem: 05 sep 2019, 17:57

dbwebb upload - local changes overwritten (med sudo)

Inlägg24 okt 2019, 08:26

Kod: Markera allt

sudo dbwebb update
sudo: unable to resolve host andershpjobb: Connection timed out
Update course-repo with latest changes from its master at GitHub.
Updating 5b1bc63..0251a0e
error: Your local changes to the following files would be overwritten by merge:
   .dbwebb/inspect
   .dbwebb/upload.include
   .gitignore
   Makefile
   example/intro-challenge/books/Comedy/.Gabe_hudson/Gork_the_Teenage_Dragon
   example/intro-challenge/books/Comedy/Ashley_Shelby/South_Pole_Station
   example/intro-challenge/books/Comedy/Scott_Meyer/Magic_2.0/An_Unwelcome_Quest
   example/intro-challenge/books/Comedy/Scott_Meyer/Magic_2.0/Fight_and_Flight
   example/intro-challenge/books/Comedy/Scott_Meyer/Magic_2.0/Off_to_Be_the_Wizard
   example/intro-challenge/books/Comedy/Scott_Meyer/Magic_2.0/Spell_or_High_Water
   example/intro-challenge/books/Fantasy/Arcanum_Unbounded_The_Cosmere_Collection
   example/intro-challenge/books/Fantasy/Brandon_Sanderson/Elantris/Elantris
   example/intro-challenge/books/Fantasy/Brandon_Sanderson/Elantris/The_Emperors_Soul
   example/intro-challenge/books/Fantasy/Brandon_Sanderson/The_Stormlight_Archive/Oathbringer
   example/intro-challenge/books/Fantasy/Brandon_Sanderson/The_Stormlight_Archive/The_Way_of_Kings
   example/intro-challenge/books/Fantasy/Brandon_Sanderson/The_Stormlight_Archive/Words_of_Radiance
   example/intro-challenge/books/Fantasy/Brandon_Sanderson/Warbreaker
   example/intro-challenge/books/Fantasy/Brent_Weeks/Lightbringer/The_Black_Prism
   example/intro-challenge/books/Fantasy/Brent_Weeks/Lightbringer/The_Blinding_Knife
   example/intro-challenge/books/Fantasy/Brent_Weeks/Lightbringer/The_Blood_Mirror
   example/intro-challenge/books/Fantasy/Brent_Weeks/Lightbringer/The_Broken_Eye
   example/intro-challenge/books/Fantasy/Brent_Weeks/Night_Angel/Beyond_the_Shadow
   example/intro-challenge/books/Fantasy/Brent_Weeks/Night_Angel/Shadows_Edge
   example/intro-challenge/books/Fantasy/Brent_Weeks/Night_Angel/The_Way_of_Shadows
   example/intro-challenge/books/Fantasy/David_Eddings/The_Tamuli/Domes_of_Fire
   example/intro-challenge/books/Fantasy/David_Eddings/The_Tamuli/The_Shining_Ones
   example/intro-challenge/books/Fantasy/Robin_Hobb/Farseer_Trilogy/Assassins_Apprentice
   example/intro-challenge/books/Fantasy/Robin_Hobb/Farseer_Trilogy/Assassins_Quest
   example/intro-challenge/books/Fantasy/Robin_Hobb/Farseer_Trilogy/Royal_Assassin
   example/intro-challenge/books/Fantasy/Robin_Hobb/Tawny_Man/Fools_Errand
   example/intro-challenge/books/Fantasy/Robin_Hobb/Tawny_Man/Fools_Fate
   example/intro-challenge/books/Fantasy/Robin_Hobb/Tawny_Man/Golden_Fool
   example/intro-challenge/books/Fantasy/Robin_Hobb/The_Fitz_and_the_Fool/Assassins_Fate
   example/intro-challenge/books/Fantasy/Robin_Hobb/The_Fitz_and_the_Fool/Fools_Assassin
   example/intro-challenge/books/Fantasy/Robin_Hobb/The_Fitz_and_the_Fool/Fools_Quest
   example/intro-challenge/books/Fiction/Emily_Bain_Murphy/The_Disappearances
   example/intro-challenge/books/Fiction/Matt_Haig/How_to_Stop_Time
   example/intro-challenge/books/Fiction/Matt_Haig/The_Hidden_City
   example/intro-challenge/books/Fiction/Rachel_Caine/Ash_and_Quill
   example/intro-challenge/books/Horror/Charlie_N_Holmberg/Followed_by_Frost
   example/intro-challenge/books/Horror/Charlie_N_Holmberg/The_Fifth_doll
   example/intro-challenge/books/Horror/Christina_Henry/Lost_Boy
   example/intro-challenge/books/Horror/Ellen_Oh/Spirit_Hunters
   example/intro-challenge/instruction.md
   example/intro-challenge/movies/Braveheart/.freeeedooom
   example/intro-challenge/movies/Braveheart/plot.txt
   example/intro-challenge/movies/Inception/.you_cant_see_me
   example/intro-challenge/movies/Inception/plot.txt
   example/intro-challenge/movies/Indiana_Jones_and_the_Last_Crusade/The_Holy_Grail.dat
   example/intro-challenge/movies/Indiana_Jones_and_the_Last_Crusade/plot.txt
   example/intro-challenge/movies/Pulp_Fiction/cheeseburger/just_another_file.md
   example/intro-challenge/movies/The_Dark_Knight/.I_am_Batman
   example/intro-challenge/movies/missing_plot_1.txt
   example/intro-challenge/movies/missing_plot_2.txt
   example/lecture_prep/solutions/analyze_functions_andreas.py
   example/lecture_prep/solutions/analyze_functions_emil.py
   example/lecture_prep/solutions/exam.py
   example/lecture_prep/solutions/myths.txt
Please commit your changes or stash them before y
Aborting
FAILED to update course repo.


Allt är uppladdat och publicerat, hur kör jag över filerna? dbwebb trouble var lugnt. samma fel utan sudo
Senast redigerad av Anders Johansson 24 okt 2019, 08:58, redigerad totalt 2 gånger.
Användarvisningsbild

mos

dbwebb

  • Inlägg: 11177
  • Blev medlem: 10 nov 2011, 09:52
  • Ort: Ronneby / Bankeryd

Re: Kommandot dbwebb version 2

Inlägg24 okt 2019, 08:42

"sudo dbwebb update" blir inte rätt, då kör du sekvensen som root, du skall köra som din egen användare.

Om du behöver köra sudo så har du troligen installerat dbwebb-cli på ett icke korrekt sätt.

Försök köra utan sudo.

Allt är uppladdat och publicerat, hur kör jag över filerna?


Det man kan göra med kommandot syns i manualen.
https://dbwebb.se/dbwebb-cli/kommandon
...
..:
.... /mos

Anders Johansson

html-kodare

  • Inlägg: 13
  • Blev medlem: 05 sep 2019, 17:57

Re: Kommandot dbwebb version 2

Inlägg24 okt 2019, 09:03

Samma problem utan sudo. Men Travis CI och CircleCI failar på repon. Säkert det är min sida felet är på? edit: såg nu samma fel i htmlphp för mig , Travis CI och CircleCI är grönt där.

Kod: Markera allt

dbwebb update
Update course-repo with latest changes from its master at GitHub.
Updating 70be5e4..c208a2d
error: Your local changes to the following files would be overwritten by merge:
   .dbwebb-validate.config
   .dbwebb/inspect
   .dbwebb/script/functions.bash
   .dbwebb/upload.include
   .gitignore
   Makefile
   docker-compose.yaml
   example/security/check-and-die.php
   example/security/file-inclusion.php
   example/security/header-injection.php
   example/security/xss.php
   package.json
Please commit your changes or stash them before you merge.
Aborting
FAILED to update course repo.





Kod: Markera allt

anders@andershpjobb ~/BTH/Dbwebbkurser/python $ dbwebb check
Details on installed utilities.
------------------------------------
bash:               /bin/bash
git:                /usr/bin/git
ssh:                /usr/bin/ssh
rsync:              /usr/bin/rsync
wget:               /usr/bin/wget
curl:               /usr/bin/curl

Details on the dbwebb-environment.
------------------------------------
Operatingsystem:    Linux andershpjobb 4.15.0-65-generic #74-Ubuntu SMP Tue Sep 17 17:06:04 UTC 2019 x86_64 x86_64 x86_64 GNU/Linux
Command issued:     dbwebb
Version of dbwebb:  v2.5.0 (2019-09-10)
Path to executable: '/usr/local/bin'
Config-file:        '/home/anders/.dbwebb.config'
Working directory:  '/home/anders/BTH/Dbwebbkurser/python'
Local user:         'anders'
Local homedir:      '/home/anders'
Remote user:        'anjn19'
Remote host:        'ssh.student.bth.se'

Details on current course-repo.
------------------------------------
Current course-repo:   'python'
Course directory:      '/home/anders/BTH/Dbwebbkurser/python'
Remote origin:         https://github.com/dbwebb-se/python.git
Course-repo version:   v3.0.1-144-g5b1bc63
Latest update to course repo was:

commit 5b1bc634def302d41fd52a0d74c478c5a24f92ce (HEAD -> master)
Author: Andreas Arnesson <Andreas_osby@hotmail.com>
Date:   Mon Jun 17 11:54:37 2019 +0200

    solution kmom06 analyser


Anders Johansson

html-kodare

  • Inlägg: 13
  • Blev medlem: 05 sep 2019, 17:57

Re: Kommandot dbwebb version 2

Inlägg24 okt 2019, 09:55

Ska jag köra forced? eller ställer jag till det då?

Kod: Markera allt

anders@andershpjobb ~/BTH/Dbwebbkurser/python $ dbwebb update
Update course-repo with latest changes from its master at GitHub.
Updating 5b1bc63..0251a0e
error: Your local changes to the following files would be overwritten by merge:
   .dbwebb/inspect
   .dbwebb/upload.include
   .gitignore
   Makefile
   example/intro-challenge/books/Comedy/.Gabe_hudson/Gork_the_Teenage_Dragon
   example/intro-challenge/books/Comedy/Ashley_Shelby/South_Pole_Station
   example/intro-challenge/books/Comedy/Scott_Meyer/Magic_2.0/An_Unwelcome_Quest
   example/intro-challenge/books/Comedy/Scott_Meyer/Magic_2.0/Fight_and_Flight
   example/intro-challenge/books/Comedy/Scott_Meyer/Magic_2.0/Off_to_Be_the_Wizard
   example/intro-challenge/books/Comedy/Scott_Meyer/Magic_2.0/Spell_or_High_Water
   example/intro-challenge/books/Fantasy/Arcanum_Unbounded_The_Cosmere_Collection
   example/intro-challenge/books/Fantasy/Brandon_Sanderson/Elantris/Elantris
   example/intro-challenge/books/Fantasy/Brandon_Sanderson/Elantris/The_Emperors_Soul
   example/intro-challenge/books/Fantasy/Brandon_Sanderson/The_Stormlight_Archive/Oathbringer
   example/intro-challenge/books/Fantasy/Brandon_Sanderson/The_Stormlight_Archive/The_Way_of_Kings
   example/intro-challenge/books/Fantasy/Brandon_Sanderson/The_Stormlight_Archive/Words_of_Radiance
   example/intro-challenge/books/Fantasy/Brandon_Sanderson/Warbreaker
   example/intro-challenge/books/Fantasy/Brent_Weeks/Lightbringer/The_Black_Prism
   example/intro-challenge/books/Fantasy/Brent_Weeks/Lightbringer/The_Blinding_Knife
   example/intro-challenge/books/Fantasy/Brent_Weeks/Lightbringer/The_Blood_Mirror
   example/intro-challenge/books/Fantasy/Brent_Weeks/Lightbringer/The_Broken_Eye
   example/intro-challenge/books/Fantasy/Brent_Weeks/Night_Angel/Beyond_the_Shadow
   example/intro-challenge/books/Fantasy/Brent_Weeks/Night_Angel/Shadows_Edge
   example/intro-challenge/books/Fantasy/Brent_Weeks/Night_Angel/The_Way_of_Shadows
   example/intro-challenge/books/Fantasy/David_Eddings/The_Tamuli/Domes_of_Fire
   example/intro-challenge/books/Fantasy/David_Eddings/The_Tamuli/The_Shining_Ones
   example/intro-challenge/books/Fantasy/Robin_Hobb/Farseer_Trilogy/Assassins_Apprentice
   example/intro-challenge/books/Fantasy/Robin_Hobb/Farseer_Trilogy/Assassins_Quest
   example/intro-challenge/books/Fantasy/Robin_Hobb/Farseer_Trilogy/Royal_Assassin
   example/intro-challenge/books/Fantasy/Robin_Hobb/Tawny_Man/Fools_Errand
   example/intro-challenge/books/Fantasy/Robin_Hobb/Tawny_Man/Fools_Fate
   example/intro-challenge/books/Fantasy/Robin_Hobb/Tawny_Man/Golden_Fool
   example/intro-challenge/books/Fantasy/Robin_Hobb/The_Fitz_and_the_Fool/Assassins_Fate
   example/intro-challenge/books/Fantasy/Robin_Hobb/The_Fitz_and_the_Fool/Fools_Assassin
   example/intro-challenge/books/Fantasy/Robin_Hobb/The_Fitz_and_the_Fool/Fools_Quest
   example/intro-challenge/books/Fiction/Emily_Bain_Murphy/The_Disappearances
   example/intro-challenge/books/Fiction/Matt_Haig/How_to_Stop_Time
   example/intro-challenge/books/Fiction/Matt_Haig/The_Hidden_City
   example/intro-challenge/books/Fiction/Rachel_Caine/Ash_and_Quill
   example/intro-challenge/books/Horror/Charlie_N_Holmberg/Followed_by_Frost
   example/intro-challenge/books/Horror/Charlie_N_Holmberg/The_Fifth_doll
   example/intro-challenge/books/Horror/Christina_Henry/Lost_Boy
   example/intro-challenge/books/Horror/Ellen_Oh/Spirit_Hunters
   example/intro-challenge/instruction.md
   example/intro-challenge/movies/Braveheart/.freeeedooom
   example/intro-challenge/movies/Braveheart/plot.txt
   example/intro-challenge/movies/Inception/.you_cant_see_me
   example/intro-challenge/movies/Inception/plot.txt
   example/intro-challenge/movies/Indiana_Jones_and_the_Last_Crusade/The_Holy_Grail.dat
   example/intro-challenge/movies/Indiana_Jones_and_the_Last_Crusade/plot.txt
   example/intro-challenge/movies/Pulp_Fiction/cheeseburger/just_another_file.md
   example/intro-challenge/movies/The_Dark_Knight/.I_am_Batman
   example/intro-challenge/movies/missing_plot_1.txt
   example/intro-challenge/movies/missing_plot_2.txt
   example/lecture_prep/solutions/analyze_functions_andreas.py
   example/lecture_prep/solutions/analyze_functions_emil.py
   example/lecture_prep/solutions/exam.py
   example/lecture_prep/solutions/myths.txt
Please commit your changes or stash them before y
Aborting
FAILED to update course repo.
anders@andershpjobb ~/BTH/Dbwebbkurser/python $


Användarvisningsbild

mos

dbwebb

  • Inlägg: 11177
  • Blev medlem: 10 nov 2011, 09:52
  • Ort: Ronneby / Bankeryd

Re: dbwebb upload (med sudo)

Inlägg24 okt 2019, 10:14

Travis och CircleCI känns inte relevant, det används för att enhetstesta kursrepon.

Det du försöker göra är en "dbwebb update", det är egentligen en "git pull" och felet du får, en lista med filer, säger att dina filer är modifierade jämfört med kursreports orginalutseende.

Git (dbwebb update) uppfattar att du har modifierat filerna och kan/vill därför inte skriva över dem med de senaste ändringarna som finns i kursrepot.

Oklart varför du hamnat i det läget, det kan finnas flera orsaker.

Du kan troligen fixa detta via följande kommando:
Kod: Markera allt
git stash
dbwebb update
...
..:
.... /mos

Anders Johansson

html-kodare

  • Inlägg: 13
  • Blev medlem: 05 sep 2019, 17:57

Re: dbwebb upload - local changes overwritten (med sudo)

Inlägg24 okt 2019, 10:44

Tackar, nu funkar det. Git hade fel emailadress , efter uppdaterat den med studentmailen så funkade det.

Vilka är online

Användare som besöker denna kategori: Google [Bot] och 14 gäster