https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23141
Victor Grousset/tuxayo <vic...@tuxayo.net> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |vic...@tuxayo.net --- Comment #18 from Victor Grousset/tuxayo <vic...@tuxayo.net> --- Conflict in debian/scripts/koha-dump # Dump database. mysqlhost="$( xmlstarlet sel -t -v 'yazgfs/config/hostname' $kohaconfig )" mysqldb="$( xmlstarlet sel -t -v 'yazgfs/config/database' $kohaconfig )" mysqluser="$( xmlstarlet sel -t -v 'yazgfs/config/user' $kohaconfig )" mysqlpass="$( xmlstarlet sel -t -v 'yazgfs/config/pass' $kohaconfig )" backupdir="$( xmlstarlet sel -t -v 'yazgfs/config/backupdir' $kohaconfig || true )" [ -z "$backupdir" ] && backupdir="/var/spool/koha/$name" dbdump="$backupdir/$name-$date.sql.gz" [ "$quiet" = "no" ] && echo "* DB to $dbdump" <<<<<<< HEAD dbflag="--databases" [ "$without_db_name" = "yes" ] && dbflag="" mysqldump $dbflag --host="$mysqlhost" \ ||||||| constructed merge base mysqldump --databases --host="$mysqlhost" \ ======= mysqldump --databases --skip-triggers --host="$mysqlhost" --port="$mysqlport" \ >>>>>>> Bug 23141: Add port number to koha-dump script --user="$mysqluser" --password="$mysqlpass" "$mysqldb" | gzip > "$dbdump" chown "root:$name-koha" "$dbdump" chmod g+r "$dbdump" -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list Koha-bugs@lists.koha-community.org https://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/