Permalink
Browse files

2006-04-02 Alexis Sukrieh,,, <sukria@backup-manager.org>

	* AUTHORS:
	  + added Brad Dixon about the S3 module.
	* VERSION:
	  + 0.7.3
	* Updated the user guide about the new purging system + minor changes.
	* lib/backup-methods.sh:
	  + Some messages updated.
	* lib/burning-methods.sh:
	  + Some messages updated.
	* lib/files.sh:
	  + Rewrite of the purging system, better handling, support the new policy
	  about master backups.
	* po/fr.po:
	  + Translation updates.
	* t/run-tests.sh:
	  + Better layout.




git-svn-id: svn://svn.backup-manager.org/backup-manager/trunk@384 2e458433-d701-0410-9826-f9b593394a3c
  • Loading branch information...
1 parent 7e6fbb9 commit 1e22b13bafd334bae19f8cd3cd4c6c403320c8f0 sukria committed Apr 2, 2006
Showing with 1,182 additions and 820 deletions.
  1. +2 −1 AUTHORS
  2. +19 −0 ChangeLog
  3. +2 −6 Makefile
  4. +1 −1 VERSION
  5. +1 −2 doc/common.ent
  6. +24 −14 doc/user-guide.sgml
  7. +132 −17 doc/user-guide.txt
  8. +2 −2 doc/version.ent
  9. +2 −2 lib/backup-methods.sh
  10. +1 −1 lib/burning-methods.sh
  11. +276 −173 lib/files.sh
  12. +289 −239 po/backup-manager.pot
  13. +391 −353 po/fr.po
  14. +28 −8 t/run-tests.sh
  15. +6 −1 t/t07-dar.sh
  16. +6 −0 t/t10-tarball-dar-blacklist.sh
View
3 AUTHORS
@@ -7,7 +7,8 @@
- Michel Grentzinger <michelg@backup-manager.org>
+ Patch submitters
-
+ Support for the Amazon S3 Web Service.
+ - Brad Dixon <rbdixon@gmail.com>
Symbolic links dumping support for zip archives
- Sven Joachim <sven_joachim@web.de>
Support for multiple configuration files
View
19 ChangeLog
@@ -1,3 +1,22 @@
+2006-04-02 Alexis Sukrieh,,, <sukria@backup-manager.org>
+
+ * AUTHORS:
+ + added Brad Dixon about the S3 module.
+ * VERSION:
+ + 0.7.3
+ * Updated the user guide about the new purging system + minor changes.
+ * lib/backup-methods.sh:
+ + Some messages updated.
+ * lib/burning-methods.sh:
+ + Some messages updated.
+ * lib/files.sh:
+ + Rewrite of the purging system, better handling, support the new policy
+ about master backups.
+ * po/fr.po:
+ + Translation updates.
+ * t/run-tests.sh:
+ + Better layout.
+
2006-03-29 Alexis Sukrieh <sukria@backup-manager.org>
* Closes bug #66 - Support of Amazon S3 uploads.
View
8 Makefile
@@ -5,7 +5,8 @@ PERL5DIR=$(DESTDIR)/usr/share/perl5
LIBDIR=$(DESTDIR)/usr/share/backup-manager
CONTRIB=$(LIBDIR)/contrib
SHAREDIR=$(DESTDIR)/usr/share/backup-manager
-SHFILES=lib/dialog.sh \
+SHFILES=\
+ lib/dialog.sh \
lib/files.sh \
lib/actions.sh \
lib/backup-methods.sh\
@@ -18,7 +19,6 @@ SHFILES=lib/dialog.sh \
lib/sanitize.sh \
lib/md5sum.sh
-
# For the backup-manager-doc package
DOCDIR = $(DESTDIR)/usr/share/doc/backup-manager
DOCHTMLDIR = $(DOCDIR)/user-guide.html
@@ -84,10 +84,6 @@ install_man: man/backup-manager-upload.8
docs:
make -C doc all
-# Quick :)
-deb:
- dpkg-buildpackage -us -uc -rfakeroot
-
clean:
rm -f build-stamp
rm -rf debian/backup-manager
View
2 VERSION
@@ -1 +1 @@
-0.7.2
+0.7.2+svn
View
3 doc/common.ent
@@ -8,7 +8,6 @@
breaking it out make maintenance easier.
-->
-
<!-- standard information -->
<!ENTITY fsf-addr "Free Software Foundation,
Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA">
@@ -18,7 +17,7 @@
<!-- Backup Manager related information -->
<!ENTITY bmngr "Backup Manager">
-<!ENTITY bmngr-version "0.7.2">
+<!ENTITY bmngr-version "0.7.3">
<!-- Email addresses -->
<!ENTITY doc-email "<email>backup-manager-devel@backup-manager.org</email>">
View
38 doc/user-guide.sgml
@@ -93,8 +93,11 @@ version &bmngr-version;.
<sect id="about-version">Version
<p>
-This is the first version of this document, it was first released with
-the release 0.6 of &bmngr;.
+This document is updated whenever a new release of &bmngr; is published.
+The current version covers all features and configuration details about version &bmngr-version;.
+
+<p>
+The first version of this document was written with the release 0.6 of &bmngr;.
<sect id="about-authors">Authors
@@ -107,7 +110,7 @@ While the author of this document has tried hard to avoid typos and other
errors, these do still occur. If you discover an error in this manual or if
you want to give any comments, suggestions, or criticisms please send an
email to the development list, backup-manager-devel@backup-manager.org, or submit
-a bug report against the "Documentation" product, in the bug tracking system.
+a bug report against the "Documentation" product, in the bug tracking system<footnote>http://bugzilla.backup-manager.org/</footnote>.
<chapt id="configuration">Configuration files
@@ -220,6 +223,19 @@ when you launch &bmngr;. During this phase, all archives older than the
authorized lifetime are dropped.
<p>
+Since version 0.7.3, &bmngr; purges only files it has created whereas in previous
+versions, it used to purge also other files within the repository.
+
+<p>
+Note that when using the incremental method for building archives, &bmngr; will
+handle differently master backups and incremental ones. The incremental backups
+will be purged like any other archives (when exceeding the authorized lifetime).
+On the ohter hand, deprecated master backups won't be purged unless there is a
+younger master backup in the repository. Then, even with a lifetime set to three
+days, a master backup will live more than three days, until a newer master
+backup is built.
+
+<p>
Example:
<example>
@@ -952,35 +968,29 @@ export BM_UPLOAD_FTP_PURGE="true"
<sect1 id="upload-s3">Amazon S3 uploads
<sect2 id="uploads-s3-desc">Description
-<p>
+<p>
Amazon's new Simple Storage Service (S3) is an Internet "web service"
that permits you to store unlimited blocks of data on their replicated
and managed systems. See http://aws.amazon.com for more
information. Registration is free and the rates are quite reasonable.
+<p>
Using the S3 upload method will permit your archives to be stored on
Amazon's S3 service. You must allocate a "bucket" to the exclusive use
of Backup Manager. Each of your created archives will be uploaded to
S3 and stored within this bucket in a key name that matches the name
of the archive.
+<p>
As with the other backup methods Backup Manager does not assist you in
restoring files from archives. You must retrieve archives from S3
using other mechanisms such as the S3Shell provided as an examle
command line utility by Amazon.
-<sect2 id="BM_UPLOAD_HOSTS"><tt>BM_UPLOAD_HOSTS</tt>
-<p>
-<em>Type: string.</em>
<p>
-This option is not required for the S3 upload method. Its value is
-ignored as there is only one Amazon S3 server.
-<p>
-Example:
-<example>
-export BM_UPLOAD_HOSTS=""
-</example>
+Note that when using this upload method, the <tt>BM_UPLOAD_HOSTS</tt> variable is
+ignored as the only valid host for S3 uploads in <tt>s3.amazon.com</tt>.
<sect2 id="BM_UPLOAD_S3_DESTINATION"><tt>BM_UPLOAD_S3_DESTINATION</tt>
<p>
View
149 doc/user-guide.txt
@@ -57,7 +57,8 @@ Contents
2.3.2. Global configuration keys
2.3.3. SSH uploads
2.3.4. FTP uploads
- 2.3.5. RSYNC uploads
+ 2.3.5. Amazon S3 uploads
+ 2.3.6. RSYNC uploads
2.4. Exports
2.4.1. Burning CDR/DVD media
2.5. Advanced features
@@ -102,8 +103,12 @@ Contents
1.2. Version
------------
- This is the first version of this document, it was first released with
- the release 0.6 of Backup Manager.
+ This document is updated whenever a new release of Backup Manager is
+ published. The current version covers all features and configuration
+ details about version 0.7.2.
+
+ The first version of this document was written with the release 0.6 of
+ Backup Manager.
1.3. Authors
@@ -117,7 +122,9 @@ Contents
manual or if you want to give any comments, suggestions, or criticisms
please send an email to the development list,
backup-manager-devel@backup-manager.org, or submit a bug report
- against the "Documentation" product, in the bug tracking system.
+ against the "Documentation" product, in the bug tracking system[1].
+
+[1] http://bugzilla.backup-manager.org/
-------------------------------------------------------------------------------
@@ -220,6 +227,19 @@ Contents
performed when you launch Backup Manager. During this phase, all
archives older than the authorized lifetime are dropped.
+ Since version 0.7.3, Backup Manager purges only files it has created
+ whereas in previous versions, it used to purge also other files within
+ the repository.
+
+ Note that when using the incremental method for building archives,
+ Backup Manager will handle differently master backups and incremental
+ ones. The incremental backups will be purged like any other archives
+ (when exceeding the authorized lifetime). On the ohter hand,
+ deprecated master backups won't be purged unless there is a younger
+ master backup in the repository. Then, even with a lifetime set to
+ three days, a master backup will live more than three days, until a
+ newer master backup is built.
+
Example:
export BM_ARCHIVE_TTL="5"
@@ -339,7 +359,20 @@ Contents
Refer to the dar manpage for details about slices.
-2.2.1.5. `BM_TARBALL_DUMPSYMLINKS'
+2.2.1.5. `BM_TARBALL_EXTRA_OPTIONS'
+-----------------------------------
+
+ _Type: string_
+
+ If you want to provide extra options to "tar" or "dar" you may do so
+ here. Leave blank unless you know what you are doing.
+
+ Example: to enable verbosity with tar (which would appeard in the
+ logfiles), use this:
+
+ BM_TARBALL_EXTRA_OPTIONS="-v"
+
+2.2.1.6. `BM_TARBALL_DUMPSYMLINKS'
----------------------------------
_Type: boolean, default: `true'._
@@ -353,7 +386,7 @@ Contents
In most of the cases, you should not use this feature.
-2.2.1.6. `BM_TARBALL_DIRECTORIES'
+2.2.1.7. `BM_TARBALL_DIRECTORIES'
---------------------------------
_Type: space-separated list, default: `""'._
@@ -365,7 +398,7 @@ Contents
export BM_TARBALL_DIRECTORIES="/etc /home /var/log/apache"
-2.2.1.7. `BM_TARBALL_BLACKLIST'
+2.2.1.8. `BM_TARBALL_BLACKLIST'
-------------------------------
_Type: space-separated list, default: `"/proc /dev /sys /tmp"'._
@@ -383,7 +416,7 @@ Contents
export BM_TARBALL_BLACKLIST="/tmp /dev /proc *.mp3 *.mpg"
-2.2.1.8. `BM_TARBALL_OVER_SSH'
+2.2.1.9. `BM_TARBALL_OVER_SSH'
------------------------------
_Type: boolean, default: `false'._
@@ -677,15 +710,16 @@ Contents
There are different upload methods, each of them behaves differently
and provides particular features. In Backup Manager 0.7.2 you can use
- FTP, SSH or RSYNC uploads.
+ FTP, SSH, RSYNC or Amazon S3 uploads.
In the same manner as for backup methods, you can choose to use as
many upload methods as you like. If you don't want to use this
feature at all, just put the keyword `none' in the configuration
`BM_UPLOAD_METHOD'.
- Note that the FTP and SSH methods are dedicated to upload archives,
- using those method depends on the use of at least one backup method.
+ Note that the FTP, SSH and S3 methods are dedicated to upload
+ archives, using those method depends on the use of at least one backup
+ method.
On the opposite, the RSYNC method uploads a directory to remote
locations, this directory can be your repository or whatever other
@@ -882,12 +916,93 @@ export BM_UPLOAD_HOSTS="mirror1.lan.mysite.net mirror2.lan.mysite.net"
export BM_UPLOAD_FTP_PURGE="true"
-2.3.5. RSYNC uploads
---------------------
+2.3.5. Amazon S3 uploads
+------------------------
2.3.5.1. Description
--------------------
+ Amazon's new Simple Storage Service (S3) is an Internet "web service"
+ that permits you to store unlimited blocks of data on their replicated
+ and managed systems. See http://aws.amazon.com for more information.
+ Registration is free and the rates are quite reasonable.
+
+ Using the S3 upload method will permit your archives to be stored on
+ Amazon's S3 service. You must allocate a "bucket" to the exclusive
+ use of Backup Manager. Each of your created archives will be uploaded
+ to S3 and stored within this bucket in a key name that matches the
+ name of the archive.
+
+ As with the other backup methods Backup Manager does not assist you in
+ restoring files from archives. You must retrieve archives from S3
+ using other mechanisms such as the S3Shell provided as an examle
+ command line utility by Amazon.
+
+ Note that when using this upload method, the `BM_UPLOAD_HOSTS'
+ variable is ignored as the only valid host for S3 uploads in
+ `s3.amazon.com'.
+
+2.3.5.2. `BM_UPLOAD_S3_DESTINATION'
+-----------------------------------
+
+ _Type: string._
+
+ This option is required for the S3 upload method. This specifies the
+ bucket used to store backup data. If the bucket does not exist it
+ will be created as a private bucket. This key overrides
+ `BM_UPLOAD_DESTINATION'. Note that Amazon requires that bucket names
+ be globally unique. Be creative picking one.
+
+ Example:
+
+ export BM_UPLOAD_S3_DESTINATION="my_backup_bucket"
+
+2.3.5.3. `BM_UPLOAD_S3_ACCESS_KEY'
+----------------------------------
+
+ _Type: string._
+
+ This option is required for the S3 upload method. After you have
+ registered Amazon will provide you an access key. You must use this
+ key to access your storage on S3.
+
+ Example:
+
+ export BM_UPLOAD_S3_ACCESS_KEY="a9sabkz0342dasv"
+
+2.3.5.4. `BM_UPLOAD_S3_SECRET_KEY'
+----------------------------------
+
+ _Type: string._
+
+ This option is required for the S3 upload method. After you have
+ registered Amazon will provide you a secret key. You must use this
+ key to write to your storage on S3.
+
+ Example:
+
+ export BM_UPLOAD_S3_SECRET_KEY="lkj2341askj123sa"
+
+2.3.5.5. `BM_UPLOAD_S3_PURGE'
+-----------------------------
+
+ _Type: boolean, default: `true'_
+
+ You can choose to purge deprecated archives before uploading new ones.
+ This purge is done over S3 and uses the configuration key
+ `BM_ARCHIVE_TTL' in the same manner as the local purge behaves (the S3
+ purge is not recursive though).
+
+ Example:
+
+ export BM_UPLOAD_S3_PURGE="true"
+
+2.3.6. RSYNC uploads
+--------------------
+
+2.3.6.1. Description
+--------------------
+
You may want to upload some parts of your file system to some remote
hosts. In these cases, archives are not needed, you just want to
synchronize some directories to remote places. This is where the
@@ -897,7 +1012,7 @@ export BM_UPLOAD_HOSTS="mirror1.lan.mysite.net mirror2.lan.mysite.net"
is a dependency against the keys `BM_UPLOAD_SSH_USER' and
`BM_UPLOAD_SSH_KEY'.
-2.3.5.2. `BM_UPLOAD_RSYNC_DIRECTORIES'
+2.3.6.2. `BM_UPLOAD_RSYNC_DIRECTORIES'
--------------------------------------
_Type: space-separated list_
@@ -908,7 +1023,7 @@ export BM_UPLOAD_HOSTS="mirror1.lan.mysite.net mirror2.lan.mysite.net"
export BM_UPLOAD_RSYNC_DIRECTORIES="/data/photos /data/videos /data/mp3"
-2.3.5.3. `BM_UPLOAD_RSYNC_HOSTS'
+2.3.6.3. `BM_UPLOAD_RSYNC_HOSTS'
--------------------------------
_Type: space-separated list_
@@ -920,7 +1035,7 @@ export BM_UPLOAD_RSYNC_DIRECTORIES="/data/photos /data/videos /data/mp3"
export BM_UPLOAD_RSYNC_HOSTS="mirror5.lan.mysite.net"
-2.3.5.4. `BM_UPLOAD_RSYNC_DESTINATION'
+2.3.6.4. `BM_UPLOAD_RSYNC_DESTINATION'
--------------------------------------
_Type: string_
@@ -932,7 +1047,7 @@ export BM_UPLOAD_RSYNC_DIRECTORIES="/data/photos /data/videos /data/mp3"
export BM_UPLOAD_RSYNC_DESTINATION="/var/archives/rsync-snapshots"
-2.3.5.5. `BM_UPLOAD_RSYNC_DUMPSYMLINKS'
+2.3.6.5. `BM_UPLOAD_RSYNC_DUMPSYMLINKS'
---------------------------------------
_Type: boolean, default: `false'._
View
4 doc/version.ent
@@ -1,2 +1,2 @@
-<!ENTITY version "1.2">
-<!ENTITY date-en "09 March, 2006">
+<!ENTITY version "1.3">
+<!ENTITY date-en "02 April, 2006">
View
4 lib/backup-methods.sh
@@ -423,7 +423,7 @@ function __build_local_archive()
file_to_create=$(__get_file_to_create "$target")
command=$(__get_backup_tarball_command) ||
- error "The filetype \$BM_TARBALL_FILETYPE is not supported."
+ error "The archive type \"\$BM_TARBALL_FILETYPE\" is not supported."
# dar is not like tar, we have to manually check for existing .1.dar files
if [ $BM_TARBALL_FILETYPE = dar ]; then
@@ -460,7 +460,7 @@ function __build_remote_archive()
file_to_create=$(__get_file_to_create_remote "$target" "$host")
command=$(__get_backup_tarball_remote_command) ||
- error "The filetype \$BM_TARBALL_FILETYPE is not supported."
+ error "The archive type \"\$BM_TARBALL_FILETYPE\" is not supported."
remote_command="ssh -i ${BM_UPLOAD_SSH_KEY} -o BatchMode=yes ${BM_UPLOAD_SSH_USER}@${host} $command"
View
2 lib/burning-methods.sh
@@ -187,7 +187,7 @@ function burn_files_interactive()
{
purge_indexes
if [ ! -z "${BM__BURNING_DATE}" ] ; then
- info "Burning archives of \$BM__BURNING_DATE"
+ info "Burning archives of \$BM__BURNING_DATE."
find_what_to_burn "${BM_REPOSITORY_ROOT}/*${BM__BURNING_DATE}*"
size=$(size_of_path "${BM_REPOSITORY_ROOT}/*${BM__BURNING_DATE}*")
else
View
449 lib/files.sh
@@ -20,195 +20,295 @@
#unmount_tmp_dir()
#{
-# if [ -n "$mount_point" ] &&
-# [ -d $mount_point ] &&
-# [ grep $mount_point /etc/mtab >/dev/null 2>&1 ]; then
-# umount "$mount_point" > /dev/null 2>&1 || error "unable to unmount \$mount_point"
-# sleep 1
-# rmdir "$mount_point" > /dev/null 2>&1 || error "unable to remove \$mount_point"
-# fi
+# if [ -n "$mount_point" ] &&
+# [ -d $mount_point ] &&
+# [ grep $mount_point /etc/mtab >/dev/null 2>&1 ]; then
+# umount "$mount_point" > /dev/null 2>&1 || error "unable to unmount \$mount_point"
+# sleep 1
+# rmdir "$mount_point" > /dev/null 2>&1 || error "unable to remove \$mount_point"
+# fi
#}
# this will send the appropriate name of archive to
# make according to what the user choose in the conf.
get_dir_name()
{
- base="$1"
- format="$2"
-
- if [ "$format" = "long" ]
- then
- # first remove the trailing slash
- base=$(echo $base | sed -e 's|/$||')
-
- # then substitue every / by a -
- dirname=`echo "$base" | sed 's/\//-/g'`
-
- elif [ "$format" = "short" ]
- then
- OLDIFS=$IFS
- export IFS="/"
- for directory in $base
- do
- parent=$directory
- done
- dirname=$directory
- export IFS=$OLDIFS
- else
- echo ""
- fi
-
- echo "$dirname"
+ base="$1"
+ format="$2"
+
+ if [ "$format" = "long" ]
+ then
+ # first remove the trailing slash
+ base=$(echo $base | sed -e 's|/$||')
+
+ # then substitue every / by a -
+ dirname=`echo "$base" | sed 's/\//-/g'`
+
+ elif [ "$format" = "short" ]
+ then
+ OLDIFS=$IFS
+ export IFS="/"
+ for directory in $base
+ do
+ parent=$directory
+ done
+ dirname=$directory
+ export IFS=$OLDIFS
+ else
+ echo ""
+ fi
+
+ echo "$dirname"
}
# This will take a path and return the size in mega bytes
# used on the disk.
# Thanks to Michel Grentzinger <mic.grentz@online.fr>
size_of_path()
{
- path="$1"
+ path="$1"
if [ -z "$path" ]; then
error "No path given."
fi
#echo "DEBUG: du --si --block-size=1000k -c $path | tail -n 1 | awk '{print $1}'" >&2
total_size=$(du --si --block-size=1000k -c $path | tail -n 1 | awk '{print $1}')
- echo $total_size
+ echo $total_size
}
# Thanks to Michel Grentzinger <mic.grentz@online.fr>
size_left_of_path()
{
- path="$1"
+ path="$1"
if [ -z "$path" ]; then
error "No path given."
fi
left=$(df --si --block-size=1000k "$path" | tail -n 1 | awk '{print $4}')
- echo $left
+ echo $left
}
# Will return the prefix contained in the file name
get_prefix_from_file()
{
- filename="$1"
- filename=$(basename $filename)
- prefix=$(echo $filename | sed -e 's/^\([^-]\+\)-.*$/\1/')
- echo $prefix
+ filename="$1"
+ filename=$(basename $filename)
+ prefix=$(echo $filename | sed -e 's/^\([^-]\+\)-.*$/\1/')
+ echo $prefix
}
# Will return the date contained in the file name
get_date_from_file()
{
- filename="$1"
- date=$(echo $filename | sed -e 's/.*\([0-9]\{8\}\).*/\1/')
- if [ $date = $filename ] ; then
- date=""
- fi
- echo $date
+ filename="$1"
+ basename="${filename%.${BM_TARBALL_FILETYPE}}"
+ file_without_date="${basename%[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]}"
+ date="${basename#${file_without_date}}"
+
+ if [ $date = $filename ] ; then
+ date=""
+ fi
+ echo $date
}
# This function is here to free each lock previously enabled.
# We have to keep in mind that lock must be done for each conffile.
# It is not global anymore, and that's the tricky thing.
release_lock() {
- if [ -e $lockfile ]; then
- # We have to remove the line which contains
- # the conffile.
- newfile=$(mktemp)
- newcontent=""
- OLDIFS=$IFS
- IFS=$'\n'
- for line in $(cat $lockfile)
- do
- thisfile=$(echo $line | awk '{print $2}')
- if [ ! $conffile = $thisfile ]; then
- echo "$line" >> $newfile
- fi
- done
- IFS=$OLDIFS
- mv $newfile $lockfile
- fi
+ if [ -e $lockfile ]; then
+ # We have to remove the line which contains
+ # the conffile.
+ newfile=$(mktemp)
+ newcontent=""
+ OLDIFS=$IFS
+ IFS=$'\n'
+ for line in $(cat $lockfile)
+ do
+ thisfile=$(echo $line | awk '{print $2}')
+ if [ ! $conffile = $thisfile ]; then
+ echo "$line" >> $newfile
+ fi
+ done
+ IFS=$OLDIFS
+ mv $newfile $lockfile
+ fi
}
# This function try to get a lock, if this is not possible,
# backup-manager won't run.
# Be aware that a there will be one lock for each conffile used.
# If the PID written in the lockfile is not alive, release.
get_lock() {
- if [ -e $lockfile ]; then
-
- # look if a lock exists for that conffile (eg, we must find
- # the path of the conffile in the lockfile)
- # lockfile format :
- # $pid $conffile
-
- pid=`grep " $conffile " $lockfile | awk '{print $1}'`
-
- # be sure that the process is running
- if [ ! -z $pid ]; then
- real_pid=$(ps --no-headers --pid $pid |awk '{print $1}')
- if [ -z $real_pid ]; then
- echo_translated "Removing lock for old PID, \$pid is not running."
- release_lock
- #unmount_tmp_dir
- pid=""
- fi
- fi
-
- if [ -n "$pid" ]; then
- # we really must not use error or _exit here !
- # this is the special point were release_lock should not be called !
- echo_translated "A backup-manager process (\$pid) is already running with the conffile \$conffile"
- exit 1
- else
- pid=$$
- info "Getting lock for backup-manager \$pid with \$conffile"
- echo "$$ $conffile " >> $lockfile
-
- fi
- else
- pid=$$
- info "Getting lock for backup-manager \$pid with \$conffile"
- echo "$$ $conffile " > $lockfile
- if [ ! -e $lockfile ]; then
- error "failed (check the file permissions)."
- exit 1
- fi
- fi
+ if [ -e $lockfile ]; then
+
+ # look if a lock exists for that conffile (eg, we must find
+ # the path of the conffile in the lockfile)
+ # lockfile format :
+ # $pid $conffile
+
+ pid=`grep " $conffile " $lockfile | awk '{print $1}'`
+
+ # be sure that the process is running
+ if [ ! -z $pid ]; then
+ real_pid=$(ps --no-headers --pid $pid |awk '{print $1}')
+ if [ -z $real_pid ]; then
+ echo_translated "Removing lock for old PID, \$pid is not running."
+ release_lock
+ #unmount_tmp_dir
+ pid=""
+ fi
+ fi
+
+ if [ -n "$pid" ]; then
+ # we really must not use error or _exit here !
+ # this is the special point were release_lock should not be called !
+ echo_translated "A backup-manager process (\$pid) is already running with the conffile \$conffile"
+ exit 1
+ else
+ pid=$$
+ info "Getting lock for backup-manager \$pid with \$conffile"
+ echo "$$ $conffile " >> $lockfile
+
+ fi
+ else
+ pid=$$
+ info "Getting lock for backup-manager \$pid with \$conffile"
+ echo "$$ $conffile " > $lockfile
+ if [ ! -e $lockfile ]; then
+ error "failed (check the file permissions)."
+ exit 1
+ fi
+ fi
}
-# Remove a file if its date is older than the
-# date of expiration.
-# If the archive is a "master", do not remove it unless there
-# is a younger master.
-clean_file()
+function get_date_from_archive()
+{
+ archive="$1"
+ archive=$(basename "$archive")
+ date=$(echo "$archive" | sed -e 's/.*\([0-9]\{8\}\).*/\1/')
+ if [ "$date" = "$archive" ] ; then
+ date=""
+ fi
+ echo "$date"
+}
+
+# Returns the name of an archive.
+# eg: get_name_from_archive "ouranos-usr-bin.20060329.tar.bz2"
+# usr-bin
+function get_name_from_archive()
+{
+ archive="$1"
+ archive=$(basename "$archive")
+
+ # drop the first token before a dash (the prefix)
+ name="${archive#*-}"
+
+ # drop the right part: everything from the first dot
+ name="${name%%.*}"
+
+ # done
+ echo "$name"
+}
+
+function get_master_from_archive()
+{
+ archive="$1"
+ archive=$(basename "$archive")
+
+ master=$(echo "$archive" | sed -e 's/.*\.\(master\)\..*/\1/')
+ if [ "$master" = "master" ]; then
+ echo "true"
+ else
+ echo "false"
+ fi
+}
+
+function get_prefix_from_archive()
{
- date_to_remove=`date +%Y%m%d --date "$BM_ARCHIVE_TTL days ago"`
- file="$1"
-
- if [ ! -f $file ]; then
- error "\$file is not a regular file."
- fi
-
- date=$(get_date_from_file $file)
- if [ "$date" != "$file" ]; then
- date=$(echo $date | sed -e 's/[^0-9]//g')
- if [ ! -z $date ]; then
- if [ $date -lt $date_to_remove ] ||
- [ $date = $date_to_remove ]; then
-
- # TODO check the master archives here
- info "Removing \$file"
- rm -f $file
- fi
- fi
- fi
+ archive="$1"
+ archive=$(basename "$archive")
+ echo "${archive%%-*}"
}
+function get_newer_master()
+{
+ prefix="$1"
+ name="$2"
+ date="$3"
+ master=""
+
+ for this_master in $BM_REPOSITORY_ROOT/$prefix-$name.*.master.*
+ do
+ this_date=$(get_date_from_archive "$this_master")
+
+ # is this master newer than the one we are testing?
+ if [ "$this_date" -gt "$date" ]; then
+# __debug "found this newer master : $this_master"
+ master="$this_master"
+ fi
+ done
+
+ echo "$this_master"
+}
+
+function clean_file()
+{
+ file="$1"
+ purge_date="$2"
+
+ if [ ! -f "$file" ]; then
+ error "\$file is not a regular file."
+ fi
+
+ prefix=$(get_prefix_from_archive "$file")
+ date=$(get_date_from_archive "$file")
+ name=$(get_name_from_archive "$file")
+ master=$(get_master_from_archive "$file")
+
+ __debug "parsing $file ($prefix, $date, $name, $master)"
+
+ # we assume that if we find that, we have an archive
+ if [ -n "$date" ] && [ "$date" != "$(basename $file)" ] &&
+ [ -n "$prefix" ] && [ "$prefix" != "$(basename $file)" ] &&
+ [ -n "$name" ] && [ "$name" != "$(basename $file)" ]; then
+
+ # look if the archive is deprecated
+ if [ "$date" -lt "$purge_date" ] ||
+ [ "$date" = "$purge_date" ]; then
+
+ # if it's a master, we have to find a newer master around
+ if [ "$master" = "true" ]; then
+ master_archive=$(get_newer_master "$prefix" "$name" "$date")
+
+ # if the master returned is not the same as the one we have,
+ # the one we have can be deleted, because it's older.
+ if [ "$master_archive" != "$file" ]; then
+ info "Removing deprecated master backup: \"\$file\"."
+ rm -f "$file"
+
+ # else, we can only remove the master archive if we cannot find any
+ # incremental archive related.
+ else
+ nb_incrementals=$(ls -l $BM_REPOSITORY_ROOT/$prefix-$name.*.* | wc -l)
+ if [ "$nb_incrementals" = "1" ]; then
+ info "Removing deprecated master backup (isolated): \"\$file\"."
+ rm -f $file
+ fi
+ fi
+
+ # the archive we handle isn't a master backup, we can drop it.
+ else
+ info "Removing archive \"\$file\"."
+ rm -f "$file"
+ fi
+ fi
+ fi
+}
+
+
# clean one given repository.
# This will take each file that has
# a date in its names and will compare
@@ -217,25 +317,28 @@ clean_file()
# we drop the file.
clean_directory()
{
- directory="$1"
-
- if [ ! -d $directory ]; then
- error "Directory given is not found."
- fi
-
- for file in $directory/*
- do
- if [ ! -e $file ]; then
- continue
- fi
-
- if [ -d $file ]; then
- info "Entering directory \$file"
- clean_directory "$file"
- else
- clean_file "$file"
- fi
- done
+ directory="$1"
+ purge_date=$(date +%Y%m%d --date "$BM_ARCHIVE_TTL days ago")
+
+# __debug "Purging archives older than $purge_date"
+
+ if [ ! -d $directory ]; then
+ error "Directory given is not found."
+ fi
+
+ for file in $directory/*
+ do
+ if [ ! -e $file ]; then
+ continue
+ fi
+
+ if [ -d $file ]; then
+ info "Entering directory \$file"
+ clean_directory "$file"
+ else
+ clean_file "$file" "$purge_date"
+ fi
+ done
}
# This takes a file and the md5sum of that file.
@@ -244,41 +347,41 @@ clean_directory()
# CONDITION: BM_ARCHIVE_PURGEDUPS = true
purge_duplicate_archives()
{
- file_to_create="$1"
+ file_to_create="$1"
- # Only purge if BM_ARCHIVE_PURGEDUPS = true
- if [ -z "$BM_ARCHIVE_PURGEDUPS" ] ||
+ # Only purge if BM_ARCHIVE_PURGEDUPS = true
+ if [ -z "$BM_ARCHIVE_PURGEDUPS" ] ||
[ "$BM_ARCHIVE_PURGEDUPS" != "true" ]; then
- return 0
- fi
+ return 0
+ fi
if [ ! -e $file_to_create ]; then
error "The given file does not exist: \$file_to_create"
return 1
fi
- if [ -z "$file_to_create" ]; then
- error "No file given."
- fi
+ if [ -z "$file_to_create" ]; then
+ error "No file given."
+ fi
- # we'll parse all the files of the same source
- date_of_file=$(get_date_from_file $file_to_create) ||
+ # we'll parse all the files of the same source
+ date_of_file=$(get_date_from_file $file_to_create) ||
error "Unable to get date from file."
- file_pattern=$(echo $file_to_create | sed -e "s/$date_of_file/\*/") ||
+ file_pattern=$(echo $file_to_create | sed -e "s/$date_of_file/\*/") ||
error "Unable to find the pattern of the file."
-
- for file in $file_pattern
- do
- if [ ! -L $file ] &&
- [ "$file" != "$file_to_create" ]; then
- md5sum_to_check=$(get_md5sum_from_file $file $BM_REPOSITORY_ROOT/${BM_ARCHIVE_PREFIX}-${TODAY}.md5)
-
- if [ "$md5hash" = "$md5sum_to_check" ]; then
- info "\$file is a duplicate of \$file_to_create (using symlink)."
- rm -f $file
- ln -s $file_to_create $file
- fi
- fi
- done
+
+ for file in $file_pattern
+ do
+ if [ ! -L $file ] &&
+ [ "$file" != "$file_to_create" ]; then
+ md5sum_to_check=$(get_md5sum_from_file $file $BM_REPOSITORY_ROOT/${BM_ARCHIVE_PREFIX}-${TODAY}.md5)
+
+ if [ "$md5hash" = "$md5sum_to_check" ]; then
+ info "\$file is a duplicate of \$file_to_create (using symlink)."
+ rm -f $file
+ ln -s $file_to_create $file
+ fi
+ fi
+ done
}
View
528 po/backup-manager.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-13 17:03+0100\n"
+"POT-Creation-Date: 2006-04-02 18:06+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,97 +21,126 @@ msgstr ""
msgid "$file_to_create: ok (${size}M,"
msgstr ""
-#: ../lib/backup-methods.sh:36
+#: ../lib/backup-methods.sh:47
#, sh-format
msgid "Unable to purge duplicates of $file_to_create"
msgstr ""
-#: ../lib/backup-methods.sh:63
+#: ../lib/backup-methods.sh:52
+#, sh-format
+msgid "Unable to change the owner of \"$file_to_create\"."
+msgstr ""
+
+#: ../lib/backup-methods.sh:54
+#, sh-format
+msgid "Unable to change file permissions of \"$file_to_create\"."
+msgstr ""
+
+#: ../lib/backup-methods.sh:76
#, sh-format
msgid "Unable to create $target, check $logfile"
msgstr ""
-#: ../lib/backup-methods.sh:74
+#: ../lib/backup-methods.sh:90
#, sh-format
msgid "File $file_to_create already exists, skipping."
msgstr ""
-#: ../lib/backup-methods.sh:85 ../lib/backup-methods.sh:97
-#: ../lib/backup-methods.sh:106
+#: ../lib/backup-methods.sh:101 ../lib/backup-methods.sh:115
+#: ../lib/backup-methods.sh:128
#, sh-format
msgid "Unable to exec $command; check $logfile"
msgstr ""
-#: ../lib/backup-methods.sh:89
+#: ../lib/backup-methods.sh:107
#, sh-format
-msgid "Compressor $compress requires $gzip"
+msgid "Compressor $compress requires $gzip."
msgstr ""
-#: ../lib/backup-methods.sh:101
+#: ../lib/backup-methods.sh:121
#, sh-format
-msgid "Compressor $compress requires $bzip"
+msgid "Compressor $compress requires $bzip."
msgstr ""
-#: ../lib/backup-methods.sh:109
+#: ../lib/backup-methods.sh:134
#, sh-format
-msgid "No such compressor supported: $compress"
+msgid "No such compressor supported: $compress."
msgstr ""
-#: ../lib/backup-methods.sh:116
+#: ../lib/backup-methods.sh:140
#, sh-format
msgid "Unable to find $file_to_create"
msgstr ""
-#: ../lib/backup-methods.sh:206
+#: ../lib/backup-methods.sh:207
+msgid "7z blacklist are not well supported..."
+msgstr ""
+
+#: ../lib/backup-methods.sh:266
msgid "No frequency given, set BM_TARBALLINC_MASTERDATETYPE."
msgstr ""
-#: ../lib/backup-methods.sh:217
+#: ../lib/backup-methods.sh:277
#, sh-format
msgid "Unknown frequency: $BM_TARBALLINC_MASTERDATETYPE"
msgstr ""
-#: ../lib/backup-methods.sh:311
+#: ../lib/backup-methods.sh:411 ../lib/backup-methods.sh:426
+#: ../lib/backup-methods.sh:463
#, sh-format
-msgid "Target $target does not exist, skipping."
+msgid "The archive type \"$BM_TARBALL_FILETYPE\" is not supported."
msgstr ""
-#: ../lib/backup-methods.sh:336
+#: ../lib/backup-methods.sh:446 ../lib/backup-methods.sh:484
#, sh-format
-msgid "The filetype $BM_TARBALL_FILETYPE is not supported."
+msgid "File $file_to_check already exists, skipping."
msgstr ""
-#: ../lib/backup-methods.sh:355
+#: ../lib/backup-methods.sh:474
#, sh-format
-msgid "File $file_to_check already exists, skipping."
+msgid "unable to exec $remote_command; check $logfile"
msgstr ""
-#: ../lib/backup-methods.sh:366 ../lib/backup-methods.sh:403
-#: ../lib/backup-methods.sh:432 ../lib/backup-methods.sh:450
+#: ../lib/backup-methods.sh:497
#, sh-format
-msgid "Using method \"$method\""
+msgid "Target $target does not exist, skipping."
msgstr ""
-#: ../lib/backup-methods.sh:394
+#: ../lib/backup-methods.sh:537 ../lib/backup-methods.sh:567
+#: ../lib/backup-methods.sh:596 ../lib/backup-methods.sh:618
+#, sh-format
+msgid "Using method \"$method\"."
+msgstr ""
+
+#: ../lib/backup-methods.sh:560
#, sh-format
msgid "During the tarballs generation, $nb_err error(s) occurred."
msgstr ""
-#: ../lib/backup-methods.sh:405
+#: ../lib/backup-methods.sh:569
#, sh-format
msgid "The \"mysql\" method is chosen, but $mysqldump is not found."
msgstr ""
-#: ../lib/backup-methods.sh:434
+#: ../lib/backup-methods.sh:598
#, sh-format
msgid "The \"svn\" method is chosen, but $svnadmin is not found."
msgstr ""
-#: ../lib/backup-methods.sh:459
+#: ../lib/backup-methods.sh:604
+#, sh-format
+msgid "SVN repository \"$repository\" is not valid; skipping."
+msgstr ""
+
+#: ../lib/backup-methods.sh:627
#, sh-format
msgid "Not enough args for this archive ($archive), skipping."
msgstr ""
+#: ../lib/backup-methods.sh:634
+msgid "Cannot create archive."
+msgstr ""
+
#: ../lib/sanitize.sh:29
#, sh-format
msgid "The configuration key $key is not set, using \"$default\"."
@@ -139,7 +168,7 @@ msgstr ""
msgid "Deprecated boolean, $key is set to \"no\", setting \"false\" instead."
msgstr ""
-#: ../lib/sanitize.sh:215
+#: ../lib/sanitize.sh:211
#, sh-format
msgid ""
"When validating the configuration file $conffile, $nb_warnings warnings were "
@@ -192,449 +221,470 @@ msgstr ""
msgid "Just purge old archives."
msgstr ""
-#: ../lib/dialog.sh:38
-msgid "Just restore <pattern> from <archive>"
-msgstr ""
-
-#: ../lib/dialog.sh:41
+#: ../lib/dialog.sh:40
msgid "Behaviour:"
msgstr ""
-#: ../lib/dialog.sh:42
+#: ../lib/dialog.sh:41
msgid "Choose an alternate config file."
msgstr ""
-#: ../lib/dialog.sh:43
+#: ../lib/dialog.sh:42
msgid "Force overwrite of existing archives."
msgstr ""
-#: ../lib/dialog.sh:46
+#: ../lib/dialog.sh:45
msgid "Unwanted actions:"
msgstr ""
-#: ../lib/dialog.sh:47
+#: ../lib/dialog.sh:46
msgid "Disable the upload process."
msgstr ""
-#: ../lib/dialog.sh:48
+#: ../lib/dialog.sh:47
msgid "Disable the burning process."
msgstr ""
-#: ../lib/dialog.sh:49
+#: ../lib/dialog.sh:48
msgid "Disable the purge process."
msgstr ""
-#: ../lib/dialog.sh:61
+#: ../lib/dialog.sh:60
msgid "Warning, process interupted, archives may be corrupted."
msgstr ""
-#: ../lib/dialog.sh:71
-msgid ""
-"the BM_TARBALL_FILETYPE conf key is set to \"zip\" but zip is not installed."
+#: ../lib/dialog.sh:74 ../lib/dialog.sh:93
+msgid "Not in interactive mode, cannot follow."
msgstr ""
-#: ../lib/dialog.sh:76
-msgid ""
-"the BM_TARBALL_FILETYPE conf key is set to \"bzip2\" but bzip2 is not "
-"installed."
+#: ../lib/logger.sh:134
+msgid "Releasing lock"
msgstr ""
-#: ../lib/dialog.sh:81
-msgid ""
-"the BM_TARBALL_FILETYPE conf key is set to \"dar\" but dar is not installed."
+#: ../lib/actions.sh:42
+msgid "No backup method used."
msgstr ""
-#: ../lib/dialog.sh:91
+#: ../lib/actions.sh:45
#, sh-format
-msgid "The BM_TARBALL_DIRECTORIES conf key is not set in $conffile"
+msgid "No such backup method: $BM_ARCHIVE_METHOD"
msgstr ""
-#: ../lib/dialog.sh:99
+#: ../lib/actions.sh:53
#, sh-format
-msgid "$BM_REPOSITORY_ROOT does not exist, creating it"
-msgstr ""
-
-#: ../lib/logger.sh:140
-msgid "Releasing lock"
-msgstr ""
-
-#: ../lib/actions.sh:40
-msgid "No backup method used."
+msgid "Unable to change the owner of \"$md5file\"."
msgstr ""
-#: ../lib/actions.sh:43
+#: ../lib/actions.sh:55
#, sh-format
-msgid "No such backup method: $BM_ARCHIVE_METHOD"
+msgid "Unable to change file permissions of \"$md5file\"."
msgstr ""
-#: ../lib/actions.sh:68
+#: ../lib/actions.sh:82
msgid "No upload method used."
msgstr ""
-#: ../lib/actions.sh:71
+#: ../lib/actions.sh:85
#, sh-format
msgid "The upload method \"$method\" is not supported; skipping."
msgstr ""
-#: ../lib/actions.sh:85
+#: ../lib/actions.sh:95
#, sh-format
-msgid ""
-"MD5 checkup is only performed on CD media. Please set the BM_BURNING_DEVICE "
-"in $conffile."
+msgid "Cleaning $BM_REPOSITORY_ROOT"
msgstr ""
-#: ../lib/actions.sh:91
+#: ../lib/actions.sh:106
#, sh-format
-msgid "The mount point $mount_point is not there"
+msgid "Running pre-command: $BM_PRE_BACKUP_COMMAND."
msgstr ""
-#: ../lib/actions.sh:95
-#, sh-format
-msgid "Mounting $BM_BURNING_DEVICE on $mount_point."
+#: ../lib/actions.sh:110
+msgid "Pre-command failed. Stopping the process."
msgstr ""
-#: ../lib/actions.sh:96
+#: ../lib/actions.sh:115
#, sh-format
-msgid "Unable to mount $BM_BURNING_DEVICE on $mount_point."
+msgid "Pre-command returned: \"$RET\" (success)."
msgstr ""
-#: ../lib/actions.sh:105
+#: ../lib/actions.sh:125
#, sh-format
-msgid "Checking MD5 sum for $base_file:"
+msgid "Running post-command: $BM_POST_BACKUP_COMMAND"
msgstr ""
-#: ../lib/actions.sh:127
-#, sh-format
-msgid "$str ok"
+#: ../lib/actions.sh:129
+msgid "Post-command failed."
msgstr ""
-#: ../lib/actions.sh:130
+#: ../lib/actions.sh:134
#, sh-format
-msgid "$str failed (read error)"
+msgid "Post-command returned: \"$RET\" (success)."
msgstr ""
-#: ../lib/actions.sh:134
-#, sh-format
-msgid "$str failed (MD5 hash mismatch)"
+#: ../lib/actions.sh:157
+msgid ""
+"The BM_TARBALL_FILETYPE conf key is set to \"zip\" but zip is not installed."
msgstr ""
-#: ../lib/actions.sh:141
-msgid "Errors encountered during MD5 controls."
+#: ../lib/actions.sh:162
+msgid ""
+"The BM_TARBALL_FILETYPE conf key is set to \"bzip2\" but bzip2 is not "
+"installed."
+msgstr ""
+
+#: ../lib/actions.sh:167
+msgid ""
+"The BM_TARBALL_FILETYPE conf key is set to \"dar\" but dar is not installed."
msgstr ""
-#: ../lib/actions.sh:145
+#: ../lib/actions.sh:177
#, sh-format
-msgid "unable to unmount the mount point $mount_point"
+msgid "The BM_TARBALL_DIRECTORIES conf key is not set in $conffile"
msgstr ""
-#: ../lib/actions.sh:146
+#: ../lib/actions.sh:186
#, sh-format
-msgid "unable to remove the mount point $mount_point"
+msgid "The repository $BM_REPOSITORY_ROOT does not exist, creating it."
msgstr ""
-#: ../lib/actions.sh:159
-msgid "No burning method used."
+#: ../lib/files.sh:71 ../lib/files.sh:84
+msgid "No path given."
msgstr ""
-#: ../lib/actions.sh:169
+#: ../lib/files.sh:154
#, sh-format
-msgid ""
-"Cannot burn archives of the $TODAY, too big: ${size}M, must fit in "
-"$BM_BURNING_MAXSIZE"
+msgid "Removing lock for old PID, $pid is not running."
msgstr ""
-#: ../lib/actions.sh:195
+#: ../lib/files.sh:164
#, sh-format
-msgid "$BM_BURNING_DEVICE is mounted, unmounting before the burning session."
+msgid ""
+"A backup-manager process ($pid) is already running with the conffile "
+"$conffile"
msgstr ""
-#: ../lib/actions.sh:196
+#: ../lib/files.sh:168 ../lib/files.sh:174
#, sh-format
-msgid "Unable to unmount the device $BM_BURNING_DEVICE"
+msgid "Getting lock for backup-manager $pid with $conffile"
msgstr ""
-#: ../lib/actions.sh:201
-#, sh-format
-msgid "Redirecting burning logs into $logfile"
+#: ../lib/files.sh:177
+msgid "failed (check the file permissions)."
msgstr ""
-#: ../lib/actions.sh:206
+#: ../lib/files.sh:260
#, sh-format
-msgid "Forcing dev=${BM_BURNING_DEVFORCED} for cdrecord commands"
+msgid "$file is not a regular file."
msgstr ""
-#: ../lib/actions.sh:214
+#: ../lib/files.sh:286
#, sh-format
-msgid "DVD burning requires $growisofs, aborting."
+msgid "Removing deprecated master backup: \"$file\"."
msgstr ""
-#: ../lib/actions.sh:217
+#: ../lib/files.sh:294
#, sh-format
-msgid "DVD burning requires $dvdrwformat, aborting."
+msgid "Removing deprecated master backup (isolated): \"$file\"."
msgstr ""
-#: ../lib/actions.sh:220
+#: ../lib/files.sh:301
#, sh-format
-msgid "Blanking the DVD media in $BM_BURNING_DEVFORCED"
+msgid "Removing archive \"$file\"."
msgstr ""
-#: ../lib/actions.sh:222
-#, sh-format
-msgid "Unable to blank the DVD media (check $logfile)."
+#: ../lib/files.sh:323
+msgid "Directory given is not found."
msgstr ""
-#: ../lib/actions.sh:224
+#: ../lib/files.sh:333
#, sh-format
-msgid "Exporting archives to the DVD media in $BM_BURNING_DEVICE."
+msgid "Entering directory $file"
msgstr ""
-#: ../lib/actions.sh:226 ../lib/actions.sh:235 ../lib/actions.sh:240
-#: ../lib/actions.sh:251
+#: ../lib/files.sh:356
#, sh-format
-msgid "failed, check $logfile"
+msgid "The given file does not exist: $file_to_create"
msgstr ""
-#: ../lib/actions.sh:230 ../lib/actions.sh:245
-#, sh-format
-msgid "CDROM burning requires $cdrecord, aborting."
+#: ../lib/files.sh:361
+msgid "No file given."
msgstr ""
-#: ../lib/actions.sh:233
-#, sh-format
-msgid "Blanking the CDRW in $BM_BURNING_DEVICE."
+#: ../lib/files.sh:366
+msgid "Unable to get date from file."
msgstr ""
-#: ../lib/actions.sh:237 ../lib/actions.sh:248
+#: ../lib/files.sh:368
+msgid "Unable to find the pattern of the file."
+msgstr ""
+
+#: ../lib/files.sh:377
#, sh-format
-msgid "Burning data to $BM_BURNING_DEVICE."
+msgid "$file is a duplicate of $file_to_create (using symlink)."
msgstr ""
-#: ../lib/actions.sh:254
-msgid "Nothing to burn."
+#: ../lib/upload-methods.sh:38
+msgid "Using the upload method \"ssh\"."
msgstr ""
-#: ../lib/actions.sh:257
-#, sh-format
-msgid ""
-"The requested burning method is not supported, check BM_BURNING_METHOD in "
-"$conffile"
+#: ../lib/upload-methods.sh:47
+msgid "No valid destination found, SSH upload not possible."
msgstr ""
-#: ../lib/actions.sh:274
-#, sh-format
-msgid "Cleaning $BM_REPOSITORY_ROOT"
+#: ../lib/upload-methods.sh:65 ../lib/upload-methods.sh:97
+#: ../lib/upload-methods.sh:126
+msgid "Unable to call backup-manager-upload."
msgstr ""
-#: ../lib/actions.sh:285
-#, sh-format
-msgid "Running pre-command: $BM_PRE_BACKUP_COMMAND."
+#: ../lib/upload-methods.sh:71
+msgid "Using the upload method \"ftp\"."
msgstr ""
-#: ../lib/actions.sh:289
-msgid "Pre-command failed. Stopping the process."
+#: ../lib/upload-methods.sh:81
+msgid "No valid destination found, FTP upload not possible."
msgstr ""
-#: ../lib/actions.sh:294
-#, sh-format
-msgid "Pre-command returned: \"$RET\" (success)."
+#: ../lib/upload-methods.sh:104
+msgid "Using the upload method \"S3\"."
msgstr ""
-#: ../lib/actions.sh:304
+#: ../lib/upload-methods.sh:135
#, sh-format
-msgid "Running post-command: $BM_POST_BACKUP_COMMAND"
+msgid "Uploading $directory to ${host}:${BM_UPLOAD_RSYNC_DESTINATION}"
msgstr ""
-#: ../lib/actions.sh:308
-msgid "Post-command failed."
+#: ../lib/upload-methods.sh:146
+msgid "Need a key to use rsync (set BM_UPLOAD_SSH_USER, BM_UPLOAD_SSH_KEY)."
msgstr ""
-#: ../lib/actions.sh:313
+#: ../lib/upload-methods.sh:156 ../lib/upload-methods.sh:164
#, sh-format
-msgid "Post-command returned: \"$RET\" (success)."
+msgid "Upload of $directory with rsync failed; check $logfile."
+msgstr ""
+
+#: ../lib/upload-methods.sh:184
+msgid "No valid destination found, RSYNC upload not possible."
+msgstr ""
+
+#: ../lib/upload-methods.sh:203
+msgid "No hosts given to the rsync method, set BM_UPLOAD_RSYNC_HOSTS."
+msgstr ""
+
+#: ../lib/upload-methods.sh:210
+msgid "Using the upload method \"rsync\"."
+msgstr ""
+
+#: ../lib/upload-methods.sh:217
+msgid "Using the upload method \"rsync-snapshots\"."
msgstr ""
-#: ../lib/files.sh:26
+#: ../lib/burning-methods.sh:30
#, sh-format
-msgid "unable to unmount $mount_point"
+msgid "$device is mounted, unmounting it."
msgstr ""
-#: ../lib/files.sh:28
+#: ../lib/burning-methods.sh:31
#, sh-format
-msgid "unable to remove $mount_point"
+msgid "Unable to unmount the device $device"
msgstr ""
-#: ../lib/files.sh:71 ../lib/files.sh:84
-msgid "No path given"
+#: ../lib/burning-methods.sh:43
+#, sh-format
+msgid ""
+"MD5 checkup is only performed on CD media. Please set the BM_BURNING_DEVICE "
+"in $conffile"
msgstr ""
-#: ../lib/files.sh:151
+#: ../lib/burning-methods.sh:49
#, sh-format
-msgid "Removing lock for old PID, $pid is not running."
+msgid "The mount point $mount_point is not there."
msgstr ""
-#: ../lib/files.sh:161
+#: ../lib/burning-methods.sh:56
#, sh-format
-msgid ""
-"A backup-manager process ($pid) is already running with the conffile "
-"$conffile"
+msgid "Mounting $BM_BURNING_DEVICE on $mount_point."
msgstr ""
-#: ../lib/files.sh:165 ../lib/files.sh:171
+#: ../lib/burning-methods.sh:66
#, sh-format
-msgid "Getting lock for backup-manager $pid with $conffile"
+msgid "Checking MD5 sum for $base_file:"
msgstr ""
-#: ../lib/files.sh:174
-msgid "failed (check the file permissions)"
+#: ../lib/burning-methods.sh:88
+#, sh-format
+msgid "$str ok"
msgstr ""
-#: ../lib/files.sh:189
+#: ../lib/burning-methods.sh:91
#, sh-format
-msgid "$file is not a regular file."
+msgid "$str failed (read error)"
msgstr ""
-#: ../lib/files.sh:197
+#: ../lib/burning-methods.sh:95
#, sh-format
-msgid "Removing $file"
+msgid "$str failed (MD5 hash mismatch)"
msgstr ""
-#: ../lib/files.sh:214
-msgid "Directory given is not found"
+#: ../lib/burning-methods.sh:102
+msgid "Errors encountered during MD5 controls."
msgstr ""
-#: ../lib/files.sh:224
+#: ../lib/burning-methods.sh:106
#, sh-format
-msgid "Entering directory $file."
+msgid "Unable to unmount the mount point $mount_point"
msgstr ""
-#: ../lib/files.sh:240
+#: ../lib/burning-methods.sh:107
#, sh-format
-msgid "No such file $file_to_create"
+msgid "Unable to remove the mount point $mount_point"
msgstr ""
-#: ../lib/files.sh:252
-msgid "No file given"
+#: ../lib/burning-methods.sh:124
+msgid "No burning method used."
msgstr ""
-#: ../lib/files.sh:256
+#: ../lib/burning-methods.sh:144
#, sh-format
-msgid "The given file does not exist: $file_to_create"
+msgid "Number of files to burn: $nb_file."
msgstr ""
-#: ../lib/files.sh:260
-msgid "unable to get date from file"
+#: ../lib/burning-methods.sh:146
+#, sh-format
+msgid ""
+"Nothing to burn for the $BM__BURNING_DATE, try the '--burn <date>' switch."
msgstr ""
-#: ../lib/files.sh:261
-msgid "unable to find the pattern of the file"
+#: ../lib/burning-methods.sh:167 ../lib/burning-methods.sh:190
+#, sh-format
+msgid "Burning archives of $BM__BURNING_DATE."
msgstr ""
-#: ../lib/files.sh:270
+#: ../lib/burning-methods.sh:172
#, sh-format
-msgid "$file is a duplicate of $file_to_create (using symlink)"
+msgid ""
+"Cannot burn archives of the $BM__BURNING_DATE, too big: ${size}M, must fit "
+"in $BM_BURNING_MAXSIZE"
msgstr ""
-#: ../lib/restore-methods.sh:25
+#: ../lib/burning-methods.sh:194
+msgid "Burning the whole archives."
+msgstr ""
+
+#: ../lib/burning-methods.sh:199
#, sh-format
-msgid "Archive does not exist: $archive"
+msgid "Trying to burn $BM_REPOSITORY_ROOT ($size MB) in interactive mode."
msgstr ""
-#: ../lib/restore-methods.sh:30
+#: ../lib/burning-methods.sh:222
#, sh-format
-msgid ""
-"The restoring area does not exist, creating it; $BM_REPOSITORY_RESTOREAREA"
+msgid "Redirecting burning logs into $logfile"
msgstr ""
-#: ../lib/restore-methods.sh:36
+#: ../lib/burning-methods.sh:227
#, sh-format
-msgid "Looking for $pattern in $archive"
+msgid "Forcing dev=${BM_BURNING_DEVFORCED} for cdrecord commands."
msgstr ""
-#: ../lib/restore-methods.sh:40
+#: ../lib/burning-methods.sh:236
#, sh-format
-msgid "Unable to copy $archive to $BM_REPOSITORY_RESTOREAREA"
+msgid "DVD+R(W) burning requires $growisofs, aborting."
msgstr ""
-#: ../lib/restore-methods.sh:57 ../lib/restore-methods.sh:69
-#: ../lib/restore-methods.sh:72 ../lib/restore-methods.sh:75
-msgid "not yet supported... FIXME"
+#: ../lib/burning-methods.sh:239
+#, sh-format
+msgid "Exporting archives to the DVD+R(W) media in $BM_BURNING_DEVICE."
msgstr ""
-#: ../lib/restore-methods.sh:78
+#: ../lib/burning-methods.sh:241 ../lib/burning-methods.sh:258
+#: ../lib/burning-methods.sh:268 ../lib/burning-methods.sh:273
+#: ../lib/burning-methods.sh:284
#, sh-format
-msgid "Unknown archive type : \"$type\"."
+msgid "failed, check $logfile"
msgstr ""
-#: ../lib/upload-methods.sh:38
-msgid "Using the upload method \"ssh\"."
+#: ../lib/burning-methods.sh:246
+#, sh-format
+msgid "DVD-R(W) burning requires $growisofs, aborting."
msgstr ""
-#: ../lib/upload-methods.sh:47
-msgid "No valid destination found, SSH upload not possible."
+#: ../lib/burning-methods.sh:249
+#, sh-format
+msgid "DVD-R(W) burning requires $dvdrwformat, aborting."
msgstr ""
-#: ../lib/upload-methods.sh:65
-msgid "Unable to call backup-manager-upload."
+#: ../lib/burning-methods.sh:252
+#, sh-format
+msgid "Blanking the DVD-R(W) media in $BM_BURNING_DEVICE"
msgstr ""
-#: ../lib/upload-methods.sh:71
-msgid "Using the upload method \"ftp\"."
+#: ../lib/burning-methods.sh:254
+#, sh-format
+msgid "Unable to blank the DVD-R(W) media (check $logfile)."
msgstr ""
-#: ../lib/upload-methods.sh:81
-msgid "No valid destination found, FTP upload not possible."
+#: ../lib/burning-methods.sh:256
+#, sh-format
+msgid "Exporting archives to the DVD-R(W) media in $BM_BURNING_DEVICE."
msgstr ""
-#: ../lib/upload-methods.sh:97
-msgid "unable to call backup-manager-upload"
+#: ../lib/burning-methods.sh:263 ../lib/burning-methods.sh:278
+#, sh-format
+msgid "CDROM burning requires $cdrecord, aborting."
msgstr ""
-#: ../lib/upload-methods.sh:106
+#: ../lib/burning-methods.sh:266
#, sh-format
-msgid "Uploading $directory to ${host}:${BM_UPLOAD_RSYNC_DESTINATION}"
+msgid "Blanking the CDRW in $BM_BURNING_DEVICE."
msgstr ""
-#: ../lib/upload-methods.sh:113 ../lib/upload-methods.sh:122
+#: ../lib/burning-methods.sh:270 ../lib/burning-methods.sh:281
#, sh-format
-msgid "Upload of $directory with rsync failed; check $logfile."
+msgid "Burning data to $BM_BURNING_DEVICE."
msgstr ""
-#: ../lib/upload-methods.sh:139
-msgid "No valid destination found, RSYNC upload not possible."
+#: ../lib/burning-methods.sh:288
+msgid "Nothing to burn."
msgstr ""
-#: ../lib/upload-methods.sh:161
-msgid "Need a key to use rsync (set BM_UPLOAD_SSH_USER, BM_UPLOAD_SSH_KEY)"
+#: ../lib/burning-methods.sh:292
+#, sh-format
+msgid ""
+"The requested burning method is not supported, check BM_BURNING_METHOD in "
+"$conffile"
msgstr ""
-#: ../lib/upload-methods.sh:164
-msgid "No hosts given to the rsync method, set BM_UPLOAD_RSYNC_HOSTS."
+#: ../lib/burning-methods.sh:341
+#, sh-format
+msgid "Not burning $file because it does not fit in the medium."
msgstr ""
-#: ../lib/upload-methods.sh:171
-msgid "Using the upload method \"rsync\"."
+#: ../lib/burning-methods.sh:382
+#, sh-format
+msgid "No such index file : $index_file"
msgstr ""
-#: ../lib/upload-methods.sh:178
-msgid "Using the upload method \"rsync-snapshots\"."
+#: ../lib/burning-methods.sh:433
+#, sh-format
+msgid "Burning content of $index"
msgstr ""
-#: ../backup-manager:69
+#: ../backup-manager:81
msgid "backup-manager must be run as root."
msgstr ""
-#: ../backup-manager:121
-msgid "The \"-c\" option must be followed by an existing filename"
+#: ../backup-manager:114
+msgid "The -b option must be followed by a valid date (YYYYMMDD)."
msgstr ""
-#: ../backup-manager:129
-msgid "The \"-r\" option must be followed by an archive and a pattern"
+#: ../backup-manager:145
+msgid "The -c option must be followed by an existing filename."
msgstr ""
-#: ../backup-manager:156
+#: ../backup-manager:182
msgid "Unable to exec the pre-command"
msgstr ""
-#: ../backup-manager:202
-msgid "Unable to exec post-command"
+#: ../backup-manager:223
+msgid "Unable to exec post-command."
msgstr ""
View
744 po/fr.po
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: backup-manager 0.6\n"
+"Project-Id-Version: backup-manager 0.7.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-13 17:03+0100\n"
-"PO-Revision-Date: 2005-12-15 17:06+0100\n"
+"POT-Creation-Date: 2006-04-02 18:06+0200\n"
+"PO-Revision-Date: 2006-04-02 17:06+0100\n"
"Last-Translator: Alexis Sukrieh <sukria@sukria.net>\n"
"Language-Team: Debian l10n French Team <debian-l10n-french@lists.debian."
"org>\n"
@@ -20,99 +20,127 @@ msgstr ""
msgid "$file_to_create: ok (${size}M,"
msgstr "$file_to_create : OK (${size} Mo,"
-#: ../lib/backup-methods.sh:36
+#: ../lib/backup-methods.sh:47
#, sh-format
msgid "Unable to purge duplicates of $file_to_create"
msgstr "Impossible de purger les doublons de $file_to_create"
-#: ../lib/backup-methods.sh:63
+#: ../lib/backup-methods.sh:52
+#, sh-format
+msgid "Unable to change the owner of \"$file_to_create\"."
+msgstr "Impossible de changer le propriétaire de « $file_to_create »."
+
+#: ../lib/backup-methods.sh:54
+#, sh-format
+msgid "Unable to change file permissions of \"$file_to_create\"."
+msgstr "Impossible de changer les droits d'accès de « $file_to_create »."
+
+#: ../lib/backup-methods.sh:76
#, sh-format
msgid "Unable to create $target, check $logfile"
msgstr "Impossible de créer $target, voir $logfile pour les détails."
-#: ../lib/backup-methods.sh:74
+#: ../lib/backup-methods.sh:90
#, sh-format
msgid "File $file_to_create already exists, skipping."
msgstr "Fichier $file_to_create existe déjà ; ignoré."
-#: ../lib/backup-methods.sh:85 ../lib/backup-methods.sh:97
-#: ../lib/backup-methods.sh:106
+#: ../lib/backup-methods.sh:101 ../lib/backup-methods.sh:115
+#: ../lib/backup-methods.sh:128
#, sh-format
msgid "Unable to exec $command; check $logfile"
msgstr "Impossible d'exécuter $command ; voir $logfile"
-#: ../lib/backup-methods.sh:89
+#: ../lib/backup-methods.sh:107
#, sh-format
-msgid "Compressor $compress requires $gzip"
+msgid "Compressor $compress requires $gzip."
msgstr "L'archiveur $compress nécessite $gzip."
-#: ../lib/backup-methods.sh:101
+#: ../lib/backup-methods.sh:121
#, sh-format
-msgid "Compressor $compress requires $bzip"
+msgid "Compressor $compress requires $bzip."
msgstr "L'archiveur $compress nécessite $bzip."
-#: ../lib/backup-methods.sh:109
+#: ../lib/backup-methods.sh:134
#, sh-format
-msgid "No such compressor supported: $compress"
+msgid "No such compressor supported: $compress."
msgstr "Cet archiveur n'est pas supporté : $compress"
-#: ../lib/backup-methods.sh:116
+#: ../lib/backup-methods.sh:140
#, sh-format
msgid "Unable to find $file_to_create"
msgstr "Impossible de trouver $file_to_create"
-#: ../lib/backup-methods.sh:206
-#, fuzzy
+#: ../lib/backup-methods.sh:207
+msgid "7z blacklist are not well supported..."
+msgstr ""
+
+#: ../lib/backup-methods.sh:266
msgid "No frequency given, set BM_TARBALLINC_MASTERDATETYPE."
-msgstr "Fréquence inconnue : $BM_TARBALLINC_MASTERDATETYPE"
+msgstr "Aucune fréquence définie, changez BM_TARBALLINC_MASTERDATETYPE."
-#: ../lib/backup-methods.sh:217
+#: ../lib/backup-methods.sh:277
#, sh-format
msgid "Unknown frequency: $BM_TARBALLINC_MASTERDATETYPE"
msgstr "Fréquence inconnue : $BM_TARBALLINC_MASTERDATETYPE"
-#: ../lib/backup-methods.sh:311
-#, fuzzy, sh-format
-msgid "Target $target does not exist, skipping."
-msgstr "La cible $DIR n'existe pas ; ignoré."
-
-#: ../lib/backup-methods.sh:336
+#: ../lib/backup-methods.sh:411 ../lib/backup-methods.sh:426
+#: ../lib/backup-methods.sh:463
#, sh-format
-msgid "The filetype $BM_TARBALL_FILETYPE is not supported."
-msgstr "Le type de fichier $BM_TARBALL_FILETYPE n'est pas géré."
+msgid "The archive type \"$BM_TARBALL_FILETYPE\" is not supported."
+msgstr "Le type d'archive « $BM_TARBALL_FILETYPE » n'est pas géré."
-#: ../lib/backup-methods.sh:355
-#, fuzzy, sh-format
+#: ../lib/backup-methods.sh:446 ../lib/backup-methods.sh:484
+#, sh-format
msgid "File $file_to_check already exists, skipping."
-msgstr "Fichier $file_to_create existe déjà ; ignoré."
+msgstr "Fichier $file_to_check existe déjà ; ignoré."
-#: ../lib/backup-methods.sh:366 ../lib/backup-methods.sh:403
-#: ../lib/backup-methods.sh:432 ../lib/backup-methods.sh:450
-#, fuzzy, sh-format
-msgid "Using method \"$method\""
-msgstr "Utilisation de la méthode de téléchargement « ftp »."
+#: ../lib/backup-methods.sh:474
+#, sh-format
+msgid "unable to exec $remote_command; check $logfile"
+msgstr "Impossible d'exécuter $remote_command ; voir $logfile"
+
+#: ../lib/backup-methods.sh:497
+#, sh-format
+msgid "Target $target does not exist, skipping."
+msgstr "La cible $target n'existe pas ; ignoré."
+
+#: ../lib/backup-methods.sh:537 ../lib/backup-methods.sh:567
+#: ../lib/backup-methods.sh:596 ../lib/backup-methods.sh:618
+#, sh-format
+msgid "Using method \"$method\"."
+msgstr "Utilisation de la méthode « $method »."
-#: ../lib/backup-methods.sh:394
+#: ../lib/backup-methods.sh:560
#, sh-format
msgid "During the tarballs generation, $nb_err error(s) occurred."
msgstr ""
"Lors de la génération des archives, $nb_err erreur(s) se sont produite(s)."
-#: ../lib/backup-methods.sh:405
+#: ../lib/backup-methods.sh:569
#, sh-format
msgid "The \"mysql\" method is chosen, but $mysqldump is not found."
msgstr "La méthode « mysql » est choisie, mais $mysqldump n'est pas présent."
-#: ../lib/backup-methods.sh:434
+#: ../lib/backup-methods.sh:598
#, sh-format
msgid "The \"svn\" method is chosen, but $svnadmin is not found."
msgstr "La méthode « svn » est choisie, mais $svnadmin n'est pas présent."
-#: ../lib/backup-methods.sh:459
+#: ../lib/backup-methods.sh:604
+#, sh-format
+msgid "SVN repository \"$repository\" is not valid; skipping."
+msgstr "Le dépôt SVN « $repository » n'est pas valide ; ignoré."
+
+#: ../lib/backup-methods.sh:627
#, sh-format
msgid "Not enough args for this archive ($archive), skipping."
msgstr "Pas assez d'arguments pour cette archive ($archive) ; ignoré."
+#: ../lib/backup-methods.sh:634
+msgid "Cannot create archive."
+msgstr "Impossible de créer l'archive."
+
#: ../lib/sanitize.sh:29
#, sh-format
msgid "The configuration key $key is not set, using \"$default\"."
@@ -147,7 +175,7 @@ msgid "Deprecated boolean, $key is set to \"no\", setting \"false\" instead."
msgstr ""
"Booléen obsolète, $key vaut « no », utilisation de « false » à la place."
-#: ../lib/sanitize.sh:215
+#: ../lib/sanitize.sh:211
#, sh-format
msgid ""
"When validating the configuration file $conffile, $nb_warnings warnings were "
@@ -202,297 +230,145 @@ msgstr "Se contente de tester les sommes MD5."
msgid "Just purge old archives."
msgstr "Se contente de supprimer les vieilles archives."
-#: ../lib/dialog.sh:38
-msgid "Just restore <pattern> from <archive>"
-msgstr ""
-
-#: ../lib/dialog.sh:41
+#: ../lib/dialog.sh:40
msgid "Behaviour:"
msgstr "Comportement :"
-#: ../lib/dialog.sh:42
+#: ../lib/dialog.sh:41
msgid "Choose an alternate config file."
msgstr "Choisit un fichier de configuration alternatif."
-#: ../lib/dialog.sh:43
+#: ../lib/dialog.sh:42
msgid "Force overwrite of existing archives."
msgstr "Oblige la réécriture d'archives existantes."
-#: ../lib/dialog.sh:46
+#: ../lib/dialog.sh:45
msgid "Unwanted actions:"
msgstr "Actions non désirées :"
-#: ../lib/dialog.sh:47
+#: ../lib/dialog.sh:46
msgid "Disable the upload process."
msgstr "Désactive la phase d'envoi de fichiers."
-#: ../lib/dialog.sh:48
+#: ../lib/dialog.sh:47
msgid "Disable the burning process."
msgstr "Désactive la phase de gravure de données."
-#: ../lib/dialog.sh:49
+#: ../lib/dialog.sh:48
msgid "Disable the purge process."
msgstr "Désactive la phase de nettoyage."
-#: ../lib/dialog.sh:61
+#: ../lib/dialog.sh:60
msgid "Warning, process interupted, archives may be corrupted."
msgstr ""
"Attention, interruption utilisateur. Les archives risquent d'être corrompues."
-#: ../lib/dialog.sh:71
-msgid ""
-"the BM_TARBALL_FILETYPE conf key is set to \"zip\" but zip is not installed."
-msgstr "La clef BM_TARBALL_FILETYPE vaut « zip » mais zip n'est pas installé."
-
-#: ../lib/dialog.sh:76
-msgid ""
-"the BM_TARBALL_FILETYPE conf key is set to \"bzip2\" but bzip2 is not "
-"installed."
-msgstr ""
-"La clef BM_TARBALL_FILETYPE vaut « bzip2 » mais bzip2 n'est pas installé."
-
-#: ../lib/dialog.sh:81
-#, fuzzy
-msgid ""
-"the BM_TARBALL_FILETYPE conf key is set to \"dar\" but dar is not installed."
-msgstr "La clef BM_TARBALL_FILETYPE vaut « zip » mais zip n'est pas installé."
-
-#: ../lib/dialog.sh:91
-#, sh-format
-msgid "The BM_TARBALL_DIRECTORIES conf key is not set in $conffile"
-msgstr "La clef BM_TARBALL_DIRECTORIES n'est pas définie dans $conffile"
-
-#: ../lib/dialog.sh:99
-#, sh-format
-msgid "$BM_REPOSITORY_ROOT does not exist, creating it"
-msgstr "$BM_REPOSITORY_ROOT n'existe pas ; création."
+#: ../lib/dialog.sh:74 ../lib/dialog.sh:93
+msgid "Not in interactive mode, cannot follow."
+msgstr "Pas en mode interactif, impossible de continuer."
-#: ../lib/logger.sh:140
+#: ../lib/logger.sh:134
msgid "Releasing lock"
msgstr "Libération du verrou."
-#: ../lib/actions.sh:40
+#: ../lib/actions.sh:42
msgid "No backup method used."
msgstr "Aucune méthode d'archivage utilisée."
-#: ../lib/actions.sh:43
+#: ../lib/actions.sh:45
#, sh-format
msgid "No such backup method: $BM_ARCHIVE_METHOD"
msgstr "Aucune méthode de ce type : $BM_ARCHIVE_METHOD"
-#: ../lib/actions.sh:68
+#: ../lib/actions.sh:53
+#, sh-format
+msgid "Unable to change the owner of \"$md5file\"."
+msgstr "Impossible de changer le propriétaire du fichier « $md5file »."
+
+#: ../lib/actions.sh:55