Debian 13 Trixie

[plegrand]

@Tom-Elliott

I’ve got an error :

git checkout stable
erreur : Vos modifications locales aux fichiers suivants seraient écrasées par l'extraction :
        lib/common/functions.sh
Veuillez valider ou remiser vos modifications avant de basculer de branche.
Abandon

git checkout stable
error: Your local changes to the following files would be overwritten by the checkout:
        lib/common/functions.sh
Please commit or stash your changes before switching branches.
Abandon

git branch
 dev-branch
* master

[Tom Elliott]

@plegrand IT seems to me you manually edited yoru lib/common/functions.sh

So you need to stash the changes or revert those changes.

This can be done in many different ways, usually the simplest method being:
git checkout lib/common/functions.sh but this would only fix this one file, if you’ve any others you changed manually, then you may need to do any/all of those files.

The stash method is another simple way to move all custom changes out of the way:

git stash then the steps.

I don’t know what changes you were making so this is entirely up to you on what steps you’re willing to part with. Have a backup handy of your installation directory just in case.

[plegrand]

@Tom-Elliott But i didnt modify this file:
lib/common/functions.sh

[plegrand]

@plegrand In fact i modify this file because of an error during install
1473 lastlog -u $username | tail -n1 | grep “**.***” >/dev/null 2>&1

I replace lastlog by lastlog2

[plegrand]

@Tom-Elliott
After “git checkout lib/common/functions.sh”
I’m stuck on Downloading kernel, init and fog-client binaries…

curl --silent -kOL https://github.com/FOGProject/fos/releases/latest/download/init.xz

• Could not download init.xz properly

[Tom Elliott]

@plegrand

It seems like maybe you’re behind a proxy? or something, I don’t know. If this were broken in general, i’m certain we’d have known about it by now.

[plegrand]

@Tom-Elliott No proxy and no network problem here

[Tom Elliott]

@plegrand Something on your network is not allowing the file to download.

Can you try the curl you see it erroring out and see what you see?

[plegrand]

@Tom-Elliott
After updating from the stable branch, I am still on 1.5.10.

[Tom Elliott]

@plegrand I’m not sure i understand what you’re saying here.

If you installed Stable branch and it completed successfully you should be on 1.5.10.1673, not 1.5.10

Did it complete successfully?

[plegrand]

@Tom-Elliott
Sorry :

Thanks for your help.
It seems to works fine now

[plegrand]

@Tom-Elliott
The upgrade to stable version completed successfully.
I’m now on fog 1.5.10.1673
Thanks again