koozali
/
ipasserelle-gp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix merge conflict on spec file

This commit is contained in:
Daniel Berteaud 2012-11-20 13:50:43 +01:00
parent 986d0b0ea4 3da1a5e5b9
commit 7a611d706b
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ipasserelle-gp.spec
View File

@ -1,4 +1,4 @@
%define version 0.2.26
%define version 0.2.27
%define release 1
%define name ipasserelle-gp
@ -26,9 +26,12 @@ Ce paquet permet de gérer un parc de machines sous MS Windows
Basé sur WPKG et d'autres outils
%changelog
* Tue Nov 20 2012 Daniel Berteaud <daniel@firewall-services.com> - 0.2.26-1
* Tue Nov 20 2012 Daniel Berteaud <daniel@firewall-services.com> - 0.2.27-1
- Exclude ImapMail.old and Mail from Thunderbird profile backups
* Sat Nov 10 2012 Daniel Berteaud <daniel@firewall-services.com> - 0.2.26-1
- Fix missing GOTO in mozBackup script
* Fri Nov 9 2012 Daniel Berteaud <daniel@firewall-services.com> - 0.2.25-1
- Use GOTO :EOF instead of exit in mozBackup

2
root/home/e-smith/files/shares/tools/files/scripts/session/015mozBackup.bat
View File

@ -24,7 +24,7 @@ REM Recherche du répertoire de profile de Thunderbird
for /f %%a in ('dir /b "%APPDATA%\Thunderbird\Profiles\*.default"') do SET TBPROFILE=%APPDATA%\Thunderbird\Profiles\%%a
REM Si le répertoire de profile n'existe pas, on s'arrête
IF NOT EXIST "%TBPROFILE%" :EOF
IF NOT EXIST "%TBPROFILE%" GOTO :EOF
REM Rotation des anciennes sauvegardes
REM Pas très élégant, mais on fait ce qu'on peut