From 48013a9d2ad0a2c20e3438a4361653f108a66149 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Mon, 5 Mar 2012 20:49:26 +0000 Subject: [PATCH] Added -hide-rr-moved to the list of ignored -as mkisofs options --- libisoburn/trunk/xorriso/emulators.c | 4 ++-- libisoburn/trunk/xorriso/xorriso_timestamp.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libisoburn/trunk/xorriso/emulators.c b/libisoburn/trunk/xorriso/emulators.c index 2f972121..5dcca1ff 100644 --- a/libisoburn/trunk/xorriso/emulators.c +++ b/libisoburn/trunk/xorriso/emulators.c @@ -651,7 +651,7 @@ int Xorriso_genisofs_ignore(struct XorrisO *xorriso, char *whom, static char ignored_arg0_options[][41]= { "-allow-leading-dots", "-ldots", "-allow-multidot", "-cache-inodes", "-no-cache-inodes", "-check-oldnames", "-D", - "-disable-deep-relocation", + "-disable-deep-relocation", "-hide-rr-moved", "-L", "-nobak", "-no-bak", "-force-rr", "-relaxed-filenames", "-T", "-no-iso-translate", @@ -1967,7 +1967,7 @@ ex:; if(was_path && (!do_print_size) && !old_root[0]) Xorriso_pacifier_callback(xorriso, "files added", xorriso->pacifier_count, xorriso->pacifier_total, "", 1); - if(do_print_size && xorriso->volset_change_pending == 1) + if(do_print_size && Xorriso_change_is_pending(xorriso, 1)) xorriso->volset_change_pending= 2; if(weight_list != NULL) free(weight_list); diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h index cbd0f1af..339631ea 100644 --- a/libisoburn/trunk/xorriso/xorriso_timestamp.h +++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2012.03.05.145346" +#define Xorriso_timestamP "2012.03.05.204946"