diff --git a/ChangeLog b/ChangeLog index 95974f1..14c009e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,5 @@ +0.2.5+ + 0.2.5 2012-05-30: correct make check error in po (affects debian build package) correct debian postinst error diff --git a/README b/README index 433b5a5..1439f45 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for udevil v0.2.5 ALPHA TEST VERSION +README for udevil v0.2.5+ ALPHA TEST VERSION THIS RELEASE IS FOR TESTING PURPOSES - USE AT YOUR OWN RISK. diff --git a/configure b/configure index 91ee5c7..c11feef 100755 --- a/configure +++ b/configure @@ -2730,7 +2730,7 @@ fi # Define the identity of the package. PACKAGE=udevil - VERSION=0.2.5 + VERSION=0.2.5+ cat >>confdefs.h <<_ACEOF diff --git a/configure.ac b/configure.ac index cbbc5e7..a9df393 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ(2.52) AC_INIT(src/udevil.c) AM_CONFIG_HEADER(config.h) AC_CONFIG_SRCDIR(src) -AM_INIT_AUTOMAKE(udevil, 0.2.5) +AM_INIT_AUTOMAKE(udevil, 0.2.5+) AC_PROG_INTLTOOL([0.21]) diff --git a/debian/changelog b/debian/changelog index 705e319..bb2ca71 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ -udevil (0.2.5-1) unstable; urgency=low +udevil (0.2.5+-1) unstable; urgency=low * release - -- IgnorantGuru Wed, 30 May 2012 15:30:47 +0000 + -- IgnorantGuru Wed, 30 May 2012 15:35:45 +0000 diff --git a/po/Makefile.in b/po/Makefile.in index 199188f..cf39da2 100644 --- a/po/Makefile.in +++ b/po/Makefile.in @@ -19,7 +19,7 @@ GETTEXT_PACKAGE = udevil PACKAGE = udevil -VERSION = 0.2.5 +VERSION = 0.2.5+ SHELL = /bin/bash diff --git a/src/device-info.c b/src/device-info.c index 478fbcd..12897f0 100644 --- a/src/device-info.c +++ b/src/device-info.c @@ -769,6 +769,8 @@ void info_device_properties( device_t *device ) { media_available = TRUE; } + else if ( g_str_has_prefix( device->devnode, "/dev/loop" ) ) + media_available = FALSE; else if ( device->device_is_removable ) { gboolean is_cd, is_floppy; @@ -1297,6 +1299,8 @@ gboolean device_get_info( device_t *device, GList* devmounts ) device->device_is_system_internal = info_is_system_internal( device ); device->mount_points = info_mount_points( device, devmounts ); device->device_is_mounted = ( device->mount_points != NULL ); + if ( device->device_is_mounted ) + device->device_is_media_available = TRUE; info_partition_table( device ); info_partition( device ); info_optical_disc( device ); diff --git a/src/udevil.c b/src/udevil.c index 7e8e6d8..06708ca 100644 --- a/src/udevil.c +++ b/src/udevil.c @@ -3259,7 +3259,14 @@ _get_type: if ( type == MOUNT_FILE && !g_file_test( data->device_file, G_FILE_TEST_IS_DIR ) && ( str = get_loop_from_file( data->device_file ) ) ) { - wlog( "udevil: denied: file %s is already mounted (or specify mount point)\n", + if ( device_is_mounted_mtab( str, &point, NULL ) ) + { + g_free( str ); + str = g_strdup_printf( "udevil: denied: file %s is already mounted at %s (or specify mount point)\n", data->device_file, point ); + wlog( str, NULL, 2 ); + } + else + wlog( "udevil: denied: file %s is already mounted (or specify mount point)\n", data->device_file, 2 ); g_free( str ); ret = 2; @@ -3269,7 +3276,6 @@ _get_type: { wlog( "udevil: denied: %s is already mounted (or specify mount point)\n", netmount->url, 2 ); - g_free( str ); ret = 2; goto _finish; } @@ -3303,6 +3309,7 @@ _get_type: str = g_strdup_printf( "Mounted %s\n", type == MOUNT_NET ? netmount->url : data->device_file ); wlog( str, NULL, -1 ); + g_free( str ); // success_exec if ( !ret )