Hello community,
here is the log from the commit of package ivman
checked in at Thu Dec 7 20:34:32 CET 2006.
--------
--- ivman/ivman.changes 2006-11-17 12:38:12.000000000 +0100
+++ /mounts/work_src_done/STABLE/ivman/ivman.changes 2006-12-06 15:55:12.000000000 +0100
@@ -1,0 +2,7 @@
+Tue Dec 5 17:19:34 CET 2006 - mkoenig@suse.de
+
+- update to version 0.6.13:
+ * Merged dbus error patch
+- provide rcivman symlink [#223757]
+
+-------------------------------------------------------------------
Old:
----
ivman-0.6.12-dbus_error.patch
ivman-0.6.12.tar.bz2
New:
----
ivman-0.6.13.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ivman.spec ++++++
--- /var/tmp/diff_new_pack.knJpCs/_old 2006-12-07 20:28:57.000000000 +0100
+++ /var/tmp/diff_new_pack.knJpCs/_new 2006-12-07 20:28:57.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package ivman (Version 0.6.12)
+# spec file for package ivman (Version 0.6.13)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -15,14 +15,13 @@
License: GNU General Public License (GPL)
Group: System/Daemons
URL: http://ivman.sourceforge.net/
-Version: 0.6.12
-Release: 34
+Version: 0.6.13
+Release: 1
Source0: http://puzzle.dl.sourceforge.net/sourceforge/ivman/%name-%version.tar.bz2
Source1: halmount.py
Source2: ivman.init
Source3: halmount.1
Patch0: %{name}-config.patch
-Patch1: %{name}-0.6.12-dbus_error.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Autoreq: on
BuildRequires: dbus-1-devel glib2-devel hal-devel libxml2-devel pkgconfig
@@ -45,7 +44,6 @@
%prep
%setup -q
%patch0
-%patch1 -p1
%build
CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{_prefix} \
@@ -63,7 +61,9 @@
install -m 644 %{SOURCE3} %{buildroot}%{_mandir}/man1
%find_lang %{name}
mkdir -p $RPM_BUILD_ROOT/etc/init.d
+mkdir -p $RPM_BUILD_ROOT/usr/sbin
install -m 755 %{S:2} $RPM_BUILD_ROOT/etc/init.d/%{name}
+ln -s /etc/init.d/%{name} $RPM_BUILD_ROOT/usr/sbin/rcivman
#post
#{fillup_and_insserv ivman}
@@ -87,8 +87,13 @@
%_mandir/man1/*
%_mandir/man5/*
%_mandir/man8/*
+/usr/sbin/rcivman
%changelog -n ivman
+* Tue Dec 05 2006 - mkoenig@suse.de
+- update to version 0.6.13:
+ * Merged dbus error patch
+- provide rcivman symlink [#223757]
* Fri Nov 17 2006 - lnussel@suse.de
- add halmount manpage
* Thu Nov 16 2006 - lnussel@suse.de
++++++ ivman-0.6.12.tar.bz2 -> ivman-0.6.13.tar.bz2 ++++++
++++ 14212 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ivman-0.6.12/configure.in new/ivman-0.6.13/configure.in
--- old/ivman-0.6.12/configure.in 2006-04-18 09:48:11.000000000 +0200
+++ new/ivman-0.6.13/configure.in 2006-12-02 01:35:51.000000000 +0100
@@ -1,8 +1,8 @@
dnl Process this file with autoconf to produce a configure script.
-AC_INIT([ivman],[0.6.12])
+AC_INIT([ivman],[0.6.13])
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(ivman,0.6.12)
+AM_INIT_AUTOMAKE(ivman,0.6.13)
dnl If 'prefix' is not set, just set it to the default prefix
if test x$prefix = xNONE; then
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ivman-0.6.12/ivman-launch new/ivman-0.6.13/ivman-launch
--- old/ivman-0.6.12/ivman-launch 2006-04-18 09:48:11.000000000 +0200
+++ new/ivman-0.6.13/ivman-launch 2006-05-23 10:00:15.000000000 +0200
@@ -1,9 +1,11 @@
#!/bin/bash
# This script was written by Daniele Favara
+#
CMD=ivman
CONFDIR= # the config dir | null
EXITWITH=
SESSION=
+set -x
while [ ! -z "$1" ];do
case "$1" in
--help|-h)
@@ -52,32 +54,45 @@
fi
;;
*)
- #usage
- echo "---"
- echo "Error $1: not a valid option"
- echo ""
- echo "Usage: ivman-launch [OPTIONS]"
- echo "Please see 'man ivman-launch' for details."
- exit 1
+ SESSION=$@ ; shift $#
;;
esac
done
echo "$CMD"
if [ "x$SESSION" = "x" ]; then
+ # start normally
exec $CMD
exit $?
else
+
+ if [ "x$EXITWITH" = "x" ]; then
+ # we were passed a session to start
+ #
+ $CMD & ivmanpid=$!
+ echo $DISPLAY
+ $SESSION
+ while ps $ivmanpid
+ do
+ kill $ivmanpid || sleep 5
+ done
+ exit $?
+ else
+ # we were called with --exit-with-session, which means we
+ # watch them and wait for them to die
+ #
exec $CMD & pid=$!
KILLCMD="kill $pid && echo 'ivman killed' && exit"
trap "eval $KILLCMD" ALRM HUP INT PIPE PROF TERM USR1 USR2 VTALRM ABRT
- while ps -C ivman -o pid --no-heading | grep -q $pid
- do
- if ! ps -C $SESSION -o user | grep -q $USER
- then
- eval $KILLCMD
- fi
- sleep 5
- done
+
+ while ps -C ivman -o pid --no-heading | grep -q $pid
+ do
+ if ! ps -C $SESSION -o user | grep -q $USER
+ then
+ eval $KILLCMD
+ fi
+ sleep 5
+ done
+ fi
fi
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ivman-0.6.12/ivman-launch.8 new/ivman-0.6.13/ivman-launch.8
--- old/ivman-0.6.12/ivman-launch.8 2006-04-18 09:48:11.000000000 +0200
+++ new/ivman-0.6.13/ivman-launch.8 2006-05-23 10:00:15.000000000 +0200
@@ -22,7 +22,7 @@
.SH NAME
ivman-launch \- launch script for Ivman
.SH SYNOPSIS
-.B ivman-launch [ " --exit-with-session " <cmd> " ] [ OPTIONS ]
+.B ivman-launch [ --exit-with-session <cmd> ] [ OPTIONS ] [ COMMAND [ ARGS... ]]
.SH DESCRIPTION
ivman-launch is a simple script used to launch Ivman. Its sole purpose is
to ensure Ivman is closed at the end of a user's login session. You can use
@@ -32,6 +32,10 @@
option: --exit-with-session. Thus, there is no point using ivman-launch if you
do not need to use this option.
+If you supply a COMMAND (with optional ARGS), the the specified
+command will be run after ivman is started, and ivman will be killed
+after that command exits.
+
.SH OPTIONS
.TP
.BR \-\-exit\-with\-session " " <cmd>
@@ -39,16 +43,30 @@
Ivman and exit itself. If the command 'cmd' is not running when ivman-launch is started,
Ivman will exit immediately. Note that this option implies Ivman will be called with the '--nofork'
option.
+option.
+.TP
+.BR \-\-debug " " \-\-nofork " " \-\-system
+These flags be passed to the launched ivman command.
-.SH EXAMPLE
-The following command in an ~/.xinitrc file would cause Ivman to launch in the background when
-your session begins, and exit when your session ends:
+.SH EXAMPLES
+.TP
.BR ivman-launch " " --exit-with-session " " xinit " " &
+The ivman process will be started, then the xinit process is watched.
+When the xinit process exits, ivman is killed. Placing this command
+in an ~/.xinitrc file would cause Ivman to launch in the background
+when your session begins, and exit when your session ends:
+.TP
+.BR ivman-launch " " /usr/bin/x-window-manager
+The ivman process is launched, then /usr/bin/x-window-manager is run,
+when x-window-manager exits, ivman is killed. This is an example of
+how ivman might be launched from Xsession in order to chain several
+programs together in one session.
.SH "SEE ALSO"
.BR ivman (8)
+.BR Xsession (5)
.SH CREDITS
This script was written by Daniele Favara.
Binary files old/ivman-0.6.12/po/fr.gmo and new/ivman-0.6.13/po/fr.gmo differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ivman-0.6.12/po/fr.po new/ivman-0.6.13/po/fr.po
--- old/ivman-0.6.12/po/fr.po 2006-04-18 09:48:11.000000000 +0200
+++ new/ivman-0.6.13/po/fr.po 2006-12-02 01:39:38.000000000 +0100
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: ivman 0.6.7\n"
"Report-Msgid-Bugs-To: rohan.pm@gmail.com\n"
-"POT-Creation-Date: 2006-04-20 17:44+1000\n"
+"POT-Creation-Date: 2006-12-02 10:39+1000\n"
"PO-Revision-Date: 2005-11-18 11:39+0100\n"
"Last-Translator: julien \n"
"Language-Team: French \n"
@@ -78,16 +78,16 @@
msgstr ""
"Avertissement : hal_xml_property_matches a été appelée avec une valeur NULL."
-#: src/IvmConfig/IvmConfigCommon.c:116
+#: src/IvmConfig/IvmConfigCommon.c:123
msgid "Warning: unhandled HAL type encountered!"
msgstr "Avertissement : détection d'un type HAL non géré!"
-#: src/IvmConfig/IvmConfigCommon.c:157
+#: src/IvmConfig/IvmConfigCommon.c:166
#, c-format
msgid "UDI %s is device %s"
msgstr "UDI %s est le device %s"
-#: src/IvmConfig/IvmConfigCommon.c:164
+#: src/IvmConfig/IvmConfigCommon.c:173
#, c-format
msgid ""
"Device %s won't be mounted because it does not specify whether or not it is "
@@ -95,12 +95,12 @@
msgstr ""
"Le device %s ne sera pas monté car il ne précise pas s'il s'agit d'un volume."
-#: src/IvmConfig/IvmConfigCommon.c:176
+#: src/IvmConfig/IvmConfigCommon.c:185
#, c-format
msgid "Device %s can't be mounted because it is not a volume"
msgstr "Le device %s ne peut être monté car il ne s'agit pas d'un volume."
-#: src/IvmConfig/IvmConfigCommon.c:190
+#: src/IvmConfig/IvmConfigCommon.c:201
#, c-format
msgid ""
"Device %s won't be mounted because no mount policy or parent device is "
@@ -109,7 +109,7 @@
"Le device %s ne sera pas monté car il manque la règle de montage ou le "
"device parent"
-#: src/IvmConfig/IvmConfigCommon.c:211
+#: src/IvmConfig/IvmConfigCommon.c:224
#, fuzzy, c-format
msgid ""
"Device %s won't be mounted because no mount policy was specified on volume "
@@ -118,7 +118,7 @@
"Le device %s ne sera pas monté car aucune règle de montage n'est fournie "
"pour lui et la règle du device parent l'interdit."
-#: src/IvmConfig/IvmConfigCommon.c:226
+#: src/IvmConfig/IvmConfigCommon.c:239
#, c-format
msgid ""
"Device %s won't be mounted because no mount policy was specified on volume "
@@ -127,21 +127,21 @@
"Le device %s ne sera pas monté car aucune règle de montage n'est fournie "
"pour lui et la règle du device parent l'interdit."
-#: src/IvmConfig/IvmConfigCommon.c:240
+#: src/IvmConfig/IvmConfigCommon.c:253
#, c-format
msgid ""
"Device %s won't be mounted because mount policy on volume says not to mount"
msgstr ""
"Le device %s ne sera pas monté car la règle de montage des volumes l'interdit"
-#: src/IvmConfig/IvmConfigCommon.c:262
+#: src/IvmConfig/IvmConfigCommon.c:274
#, c-format
msgid "Device %s can't be mounted because it is a disc with no data tracks"
msgstr ""
"Le device %s ne sera pas monté car il s'agit d'un disque sans pistes de "
"données"
-#: src/IvmConfig/IvmConfigCommon.c:294
+#: src/IvmConfig/IvmConfigCommon.c:306
#, fuzzy, c-format
msgid ""
"Device %s won't be mounted because storage.automount_enabled_hint = false on "
@@ -150,11 +150,6 @@
"Le device %s ne sera pas monté car il manque la règle de montage ou le "
"device parent"
-#: src/IvmConfig/IvmConfigCommon.c:311
-#, fuzzy, c-format
-msgid "Won't try to mount device %s, as it is already mounted"
-msgstr "Device retiré: %s"
-
#: src/IvmConfig/IvmConfigCommon.c:319
#, c-format
msgid "Device %s appears to be mountable"
@@ -350,35 +345,46 @@
msgid "pmount-hal was found on your system. It will be used for mounting.\n"
msgstr "pmount-hal a été trouvé. Les montages seront effectués avec.\n"
-#: src/manager.c:290
+#: src/manager.c:289
+#, fuzzy
+msgid "gnome-mount was not found on your system.\n"
+msgstr "mount est introuvable.\n"
+
+#: src/manager.c:293
+#, fuzzy
+msgid "gnome-mount was found on your system. It will be used for mounting.\n"
+msgstr "pmount a été trouvé. Les montages seront effectués avec.\n"
+
+#: src/manager.c:303
+#, fuzzy
msgid ""
-"pmount-hal detection skipped, as we are a root instance of Ivman. pmount-"
-"hal is only used for user instances.\n"
+"pmount-hal/gnome-mount detection skipped, as we are a root instance of "
+"Ivman. pmount-hal/gnome-mount is only used for user instances.\n"
msgstr ""
"La détection de pmount-hal est inutile cat ivman a l'identité 'root'.pmount-"
"hal n'est utilisé dans ce cas.\n"
-#: src/manager.c:297
+#: src/manager.c:310
msgid "pmount was not found on your system.\n"
msgstr "pmount est introuvable.\n"
-#: src/manager.c:302
+#: src/manager.c:315
msgid "pmount was found on your system, but pumount wasn't!\n"
msgstr "pmount a été trouvé mais pas pumount!\n"
-#: src/manager.c:310 src/manager.c:335
+#: src/manager.c:323 src/manager.c:348
msgid "pmount was found on your system. It will be used for mounting.\n"
msgstr "pmount a été trouvé. Les montages seront effectués avec.\n"
-#: src/manager.c:333
+#: src/manager.c:346
msgid "pmount accepts -u <umask>\n"
msgstr "pmount accepte -u <umask>\n"
-#: src/manager.c:356
+#: src/manager.c:369
msgid "pmount does not accept -u <umask>"
msgstr "pmount n'accepte pas -u <umask>"
-#: src/manager.c:359
+#: src/manager.c:372
#, c-format
msgid ""
"WARNING: pmount does not accept -u <umask>, so I will not mount volumes with "
@@ -389,15 +395,15 @@
"pas effectués avec car ils ne seraient accessibles qu'avec le compte "
"utilisateur %s. Vous devriez installer une version plus récente de pmount.\n"
-#: src/manager.c:370
+#: src/manager.c:383
msgid "mount was not found on your system.\n"
msgstr "mount est introuvable.\n"
-#: src/manager.c:376
+#: src/manager.c:389
msgid "mount was found on your system, but umount was not!\n"
msgstr "mount a été trouvé mais pas umount!\n"
-#: src/manager.c:381
+#: src/manager.c:394
msgid ""
"mount was found on your system. It will be used for mounting. This means "
"you need fstab entries for the devices you want mounted, or you need to use "
@@ -408,30 +414,30 @@
"que vous utilisize fstab-sync. Il est fortement recommandé d'utiliser pmount "
"à la place.\n"
-#: src/manager.c:436
+#: src/manager.c:449
msgid "Settings directory does not exist, attempting to create it...\n"
msgstr ""
"Le répertoire stockant les options n'existe pas. Tentative de création en "
"cours...\n"
-#: src/manager.c:460
+#: src/manager.c:473
#, c-format
msgid "Couldn't create new directory %s\n"
msgstr "Impossible de créer le répertoire %s\n"
-#: src/manager.c:491
+#: src/manager.c:504
#, c-format
msgid "Configuration file %s not found, creating one with default content...\n"
msgstr ""
"Le fichier de configuration %s n'existe pas. Création avec les valeurs par "
"défaut en cours...\n"
-#: src/manager.c:503
+#: src/manager.c:516
#, c-format
msgid "Couldn't create configuration file %s!\n"
msgstr "Impossible de créer le fichier de configuration %s!\n"
-#: src/manager.c:526
+#: src/manager.c:539
msgid ""
"Could not parse IvmConfigBase.xml! Please check this file for errors! Since "
"I need IvmConfigBase.xml to function, I will now exit.\n"
@@ -439,115 +445,115 @@
"Le format de IvmConfigBase.xml est incorrect! Merci de le vérifier! Ivman ne "
"peut fonctionner sans : arrêt du programme.\n"
-#: src/manager.c:709
+#: src/manager.c:727
msgid "Warning: unhandled HAL type encountered, NULL substituted for value!\n"
msgstr "Avertissement : type HAL non géré, remplacement par la valeur NULL!\n"
-#: src/manager.c:716
+#: src/manager.c:734
msgid ""
"Warning: nonexistent HAL property encountered, NULL substituted for value!\n"
msgstr ""
"Avertissement : propriété HAL inconnue, remplacement par la valeur NULL!\n"
-#: src/manager.c:768
+#: src/manager.c:786
#, c-format
msgid "Running: %s\n"
msgstr "Exécution de: %s\n"
-#: src/manager.c:772
+#: src/manager.c:790
#, c-format
msgid "Execution of %s failed with error: %s\n"
msgstr "Exécution de %s en erreur: %s\n"
-#: src/manager.c:824
+#: src/manager.c:843
#, c-format
msgid "Checking for video DVD in device '%s' mounted at '%s'\n"
msgstr "Recherche de capacité DVD vidéo dans le device '%s' monté sur '%s'\n"
-#: src/manager.c:842
+#: src/manager.c:861
#, c-format
msgid "%s looks like a video DVD\n"
msgstr "%s semble être un lecteur de DVD vidéo\n"
-#: src/manager.c:844
+#: src/manager.c:863
#, c-format
msgid "%s does not look like a video DVD\n"
msgstr "%s ne semble pas être un lecteur de DVD vidéo\n"
-#: src/manager.c:863
+#: src/manager.c:882
#, c-format
msgid "Can't mount %s; no mount command available!\n"
msgstr ""
"Impossible de monter %s; aucune commande de montage n'est disponible!\n"
-#: src/manager.c:949
+#: src/manager.c:975
msgid ""
"WARNING: execdvd rule found. execdvd is deprecated. Use HAL property "
"volume.disc.is_videodvd instead."
msgstr ""
-#: src/manager.c:977
+#: src/manager.c:1003
msgid "Giving other programs a chance to mount...\n"
msgstr "Abandon du montage aux profits d'éventuels autres programmes...\n"
-#: src/manager.c:988
+#: src/manager.c:1014
#, c-format
msgid "Attempting to mount device %s\n"
msgstr "Tentative de montage du device %s\n"
-#: src/manager.c:1004
+#: src/manager.c:1030
#, c-format
msgid "%s wasn't mounted, by us or by others..."
msgstr "%s n'est pas monté, ni par Ivman ni par quelqu'un d'autre..."
-#: src/manager.c:1033
+#: src/manager.c:1059
#, c-format
msgid "Couldn't get mount point of device %s after 5 seconds\n"
msgstr ""
"Impossible d'obtenir le point de montage du device %s après 5 secondes\n"
-#: src/manager.c:1038
+#: src/manager.c:1064
#, fuzzy, c-format
msgid "Device %s is mounted at %s\n"
msgstr "Device retiré: %s"
-#: src/manager.c:1089
+#: src/manager.c:1115
#, c-format
msgid "Unmounting %s\n"
msgstr "Démontage de %s\n"
-#: src/manager.c:1100
+#: src/manager.c:1126
#, c-format
msgid "bindtextdomain() failed: %s\n"
msgstr "bindtextdomain() a échoué: %s\n"
-#: src/manager.c:1103
+#: src/manager.c:1129
#, c-format
msgid "textdomain() failed: %s\n"
msgstr "textdomain() a échoué: %s\n"
-#: src/manager.c:1106
+#: src/manager.c:1132
#, c-format
msgid "setlocale() failed: %s\n"
msgstr "setlocale() a échoué: %s\n"
-#: src/manager.c:1131 src/manager.c:1138
+#: src/manager.c:1157 src/manager.c:1164
msgid "Failed to create HAL context!\n"
msgstr "Echec de la création du contexte HAL!\n"
-#: src/manager.c:1144
+#: src/manager.c:1170
msgid "Couldn't connect to HAL!\n"
msgstr "Echec de la connexion à HAL!\n"
-#: src/manager.c:1161
+#: src/manager.c:1187
msgid "Couldn't initialise HAL!\n"
msgstr "Echec de l'initialisation de HAL!\n"
-#: src/manager.c:1170
+#: src/manager.c:1196
msgid "Failed to watch all HAL properties!\n"
msgstr "Echec de la consultation de toutes les propriétés HAL!\n"
-#: src/manager.c:1175
+#: src/manager.c:1201
#, c-format
msgid ""
"Failed to watch all HAL properties!\n"
@@ -556,21 +562,21 @@
"Echec de la consultation de toutes les propriétés HAL!\n"
"Erreur: %s\n"
-#: src/manager.c:1211
+#: src/manager.c:1237
#, fuzzy
msgid "Will run through properties for every device currently attached\n"
msgstr "Exécution des règles pour toutes les propriétés courantes.\n"
-#: src/manager.c:1218
+#: src/manager.c:1244
#, fuzzy
msgid "Will run through actions for every device currently attached\n"
msgstr "Exécution des règles pour toutes les propriétés courantes.\n"
-#: src/manager.c:1230
+#: src/manager.c:1256
msgid " Couldn't enumerate all devices!\n"
msgstr "Impossible de lister tous les devices!\n"
-#: src/manager.c:1284
+#: src/manager.c:1310
msgid ""
"Force Ivman to run in system-wide mode. Use this if you want Ivman to behave "
"like you started it as root, even if you did not."
@@ -578,39 +584,39 @@
"Exécution forcée d'Ivman en mode système. Utilisez ceci pour que ivman se "
"comporte comme s'il avait l'identité root alors que ce n'est pas le cas."
-#: src/manager.c:1288
+#: src/manager.c:1314
msgid "Force Ivman to show debugging output."
msgstr "Force Ivman à écrire les informations de debug."
-#: src/manager.c:1290
+#: src/manager.c:1316
msgid ""
"Force Ivman to look in a specific directory for configuration (default: /etc/"
"ivman or ~/.ivman)"
msgstr ""
"Force le répertoire de configuration (par default: /etc/ivman or ~/.ivman)"
-#: src/manager.c:1293
+#: src/manager.c:1319
msgid "Force Ivman not to daemonize itself."
msgstr "Empêche Ivman de s'exécuter en tâche de fond."
-#: src/manager.c:1298
+#: src/manager.c:1324
msgid "- start ivman"
msgstr "- démarre ivman"
-#: src/manager.c:1310
+#: src/manager.c:1336
msgid "-c option given with no directory!"
msgstr "L'option -c attend un nom de répertoire!"
-#: src/manager.c:1340
+#: src/manager.c:1366
msgid "Can't find home directory, exiting!\n"
msgstr "Répertoire 'home' introuvable, arrêt!\n"
-#: src/manager.c:1357
+#: src/manager.c:1383
#, c-format
msgid "Directory %s will be used for configuration files."
msgstr "Le répertoire %s va être utilisé pour les fichiers de configuration."
-#: src/manager.c:1378
+#: src/manager.c:1404
msgid ""
"An appropriate mount command could not be found! Please make sure you have "
"mount/umount or pmount/pumount in Ivman's PATH. Mounting currently will not "
@@ -620,39 +626,39 @@
"dispose du chemin de mount/umount ou pmount/pumount dans la variable PATH. "
"Les montages ne seront pas effectués.\n"
-#: src/manager.c:1407
+#: src/manager.c:1433
msgid "Compiled against HAL 0.4.x or earlier\n"
msgstr "Compilé avec HAL 0.4.x ou une version plus ancienne\n"
-#: src/manager.c:1409
+#: src/manager.c:1435
msgid "Compiled against HAL 0.5.x or later\n"
msgstr "Compilé avec HAL 0.5.x ou une version plus récente\n"
-#: src/manager.c:1413
+#: src/manager.c:1439
msgid "Running in system mode.\n"
msgstr "Exécution en mode système.\n"
-#: src/manager.c:1416
+#: src/manager.c:1442
msgid "Running in user mode.\n"
msgstr "Exécution en mode utilisateur.\n"
-#: src/manager.c:1425
+#: src/manager.c:1451
msgid "Couldn't daemonize, exiting..."
msgstr "Impossible de s'exécuter en tâche de fond, arrêt..."
-#: src/manager.c:1433
+#: src/manager.c:1459
msgid "Couldn't drop privileges, exiting!"
msgstr "Impossible de perdre les privilèges, Arrêt!"
-#: src/manager.c:1440
+#: src/manager.c:1466
msgid "Error creating main loop!\n"
msgstr "Error de création de la boucle principale!\n"
-#: src/manager.c:1450
+#: src/manager.c:1476
msgid "Entering main loop.\n"
msgstr "Entrée dans la boucle principale.\n"
-#: src/manager.c:1452
+#: src/manager.c:1478
msgid "Exiting normally.\n"
msgstr "Arrêt normal.\n"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ivman-0.6.12/src/IvmConfig/IvmConfigCommon.c new/ivman-0.6.13/src/IvmConfig/IvmConfigCommon.c
--- old/ivman-0.6.12/src/IvmConfig/IvmConfigCommon.c 2006-04-18 09:48:11.000000000 +0200
+++ new/ivman-0.6.13/src/IvmConfig/IvmConfigCommon.c 2006-12-02 01:30:16.000000000 +0100
@@ -11,7 +11,7 @@
*
* See http://www.troll.no/qpl for QPL licensing information.
*
- * $Id: IvmConfigCommon.c,v 1.12 2006/04/18 03:15:12 ro_han Exp $
+ * $Id: IvmConfigCommon.c,v 1.13 2006/12/02 00:30:16 ro_han Exp $
*****************************************************************************/
// Common functions which more than one IvmConfig* needs to call.
@@ -46,9 +46,13 @@
if (libhal_device_property_exists
(hal_ctx, udi, devProperty, &dbus_error))
{
- int type = libhal_device_get_property_type(hal_ctx, udi,
- devProperty,
- &dbus_error);
+ int type;
+
+ ivm_check_dbus_error(&dbus_error);
+ type = libhal_device_get_property_type(hal_ctx, udi,
+ devProperty,
+ &dbus_error);
+ ivm_check_dbus_error(&dbus_error);
if (type == DBUS_TYPE_STRING)
{
@@ -56,6 +60,7 @@
(char *) libhal_device_get_property_string(hal_ctx, udi,
devProperty,
&dbus_error);
+ ivm_check_dbus_error(&dbus_error);
if (!xmlStrcmp(value, (const xmlChar *) propVal))
{
@@ -96,7 +101,8 @@
gboolean matches = (libhal_device_get_property_uint64
(hal_ctx, udi, devProperty, &dbus_error) == value_i);
- free(devProperty);
+ ivm_check_dbus_error(&dbus_error);
+ free(devProperty);
return matches;
} // unsigned int
@@ -108,6 +114,7 @@
gboolean matches = (libhal_device_get_property_int
(hal_ctx, udi, devProperty,
&dbus_error) == value_i);
+ ivm_check_dbus_error(&dbus_error);
free(devProperty);
return matches;
} // signed int
@@ -149,6 +156,8 @@
if ( !libhal_device_property_exists
(hal_ctx, udi, "block.device", &dbus_error))
return FALSE;
+ ivm_check_dbus_error(&dbus_error);
+
char *device = (char *) libhal_device_get_property_string(hal_ctx, udi,
"block.device",
@@ -156,7 +165,7 @@
assert(device);
DEBUG(_("UDI %s is device %s"), udi, device, &dbus_error);
// if we get here, condition one is satisfied
-
+ ivm_check_dbus_error(&dbus_error);
if (!libhal_device_property_exists
(hal_ctx, udi, "block.is_volume", &dbus_error))
@@ -180,10 +189,12 @@
}
// if we get here, condition two is satisfied
+ ivm_check_dbus_error(&dbus_error);
if (!libhal_device_property_exists
(hal_ctx, udi, "volume.policy.should_mount", &dbus_error))
{
+ ivm_check_dbus_error(&dbus_error);
if (!libhal_device_property_exists
(hal_ctx, udi, "block.storage_device", &dbus_error))
{
@@ -194,6 +205,7 @@
return FALSE;
}
+ ivm_check_dbus_error(&dbus_error);
char *new_udi = (char *) libhal_device_get_property_string(hal_ctx,
udi,
"block.storage_device",
@@ -202,11 +214,12 @@
if (!libhal_device_property_exists
(hal_ctx, new_udi, "storage.policy.should_mount", &dbus_error))
{
+ ivm_check_dbus_error(&dbus_error);
// OK, so no storage policy was specified anywhere. Now we'll mount
// if parent device is removable.
if (
- !libhal_device_property_exists( hal_ctx, new_udi, "storage.removable", &dbus_error ) ||
- !libhal_device_get_property_bool( hal_ctx, new_udi, "storage.removable", &dbus_error )
+ !libhal_device_property_exists( hal_ctx, new_udi, "storage.removable", NULL ) ||
+ !libhal_device_get_property_bool( hal_ctx, new_udi, "storage.removable", NULL )
) {
DEBUG(_("\
Device %s won't be mounted because no mount policy was specified on \
@@ -221,7 +234,7 @@
!libhal_device_get_property_bool(hal_ctx,
new_udi,
"storage.policy.should_mount",
- &dbus_error))
+ NULL))
{
DEBUG(_("\
Device %s won't be mounted because no mount policy was specified on \
@@ -235,7 +248,7 @@
else if (
!libhal_device_get_property_bool(hal_ctx, udi,
"volume.policy.should_mount",
- &dbus_error))
+ NULL))
{
DEBUG(_("\
Device %s won't be mounted because mount policy on volume says not \
@@ -245,19 +258,18 @@
}
// if we get here, condition three is satisfied
-
+ ivm_check_dbus_error(&dbus_error);
/* Sufficient conditions for a volume to _not_ be mountable: (just one
of these being true is sufficient)
1) volume is a disc with no data
2) storage.automount_enabled_hint = false on block.storage_device
- 3) volume.is_mounted == true
*/
if (libhal_device_property_exists
- (hal_ctx, udi, "volume.disc.has_data", &dbus_error)
+ (hal_ctx, udi, "volume.disc.has_data", NULL)
&& (!libhal_device_get_property_bool(hal_ctx, udi,
"volume.disc.has_data",
- &dbus_error)))
+ NULL)))
{
DEBUG(_("\
Device %s can't be mounted because it is a disc with no data tracks"), device);
@@ -269,26 +281,26 @@
hal_ctx,
udi,
"block.storage_device",
- &dbus_error
+ NULL
)
) {
char *new_udi = (char *) libhal_device_get_property_string(
hal_ctx,
udi,
"block.storage_device",
- &dbus_error
+ NULL
);
assert(new_udi);
if ( libhal_device_property_exists(
hal_ctx,
new_udi,
"storage.automount_enabled_hint",
- &dbus_error
+ NULL
) && !libhal_device_get_property_bool(
hal_ctx,
new_udi,
"storage.automount_enabled_hint",
- &dbus_error
+ NULL
) ) {
DEBUG(_(
"Device %s won't be mounted because "
@@ -301,18 +313,6 @@
}
libhal_free_string(new_udi);
}
-
- if (libhal_device_property_exists
- (hal_ctx, udi, "volume.is_mounted", &dbus_error)
- && (libhal_device_get_property_bool(hal_ctx, udi,
- "volume.is_mounted",
- &dbus_error)))
- {
- DEBUG(_("\
-Won't try to mount device %s, as it is already mounted"), device);
- libhal_free_string(device);
- return FALSE;
- }
// yay, we made it!!!
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ivman-0.6.12/src/dbus_interface.c new/ivman-0.6.13/src/dbus_interface.c
--- old/ivman-0.6.12/src/dbus_interface.c 2006-04-18 09:48:11.000000000 +0200
+++ new/ivman-0.6.13/src/dbus_interface.c 2006-12-02 01:30:15.000000000 +0100
@@ -11,7 +11,7 @@
*
* See http://www.troll.no/qpl for QPL licensing information.
*
- * $Id: dbus_interface.c,v 1.6 2005/11/29 00:42:48 ro_han Exp $
+ * $Id: dbus_interface.c,v 1.7 2006/12/02 00:30:15 ro_han Exp $
*****************************************************************************/
#include
@@ -24,5 +24,6 @@
{
if (dbus_error_is_set(error)) {
DEBUG(_("DBus Error! %s: %s"), error->name, error->message);
+ dbus_error_free(error);
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ivman-0.6.12/src/manager.c new/ivman-0.6.13/src/manager.c
--- old/ivman-0.6.12/src/manager.c 2006-04-18 09:48:11.000000000 +0200
+++ new/ivman-0.6.13/src/manager.c 2006-12-02 01:30:15.000000000 +0100
@@ -11,7 +11,7 @@
*
* See http://www.troll.no/qpl for QPL licensing information.
*
- * $Id: manager.c,v 1.74 2006/04/18 04:20:23 ro_han Exp $
+ * $Id: manager.c,v 1.77 2006/12/02 00:30:15 ro_han Exp $
************************************************************************/
#define _GNU_SOURCE
@@ -266,11 +266,11 @@
// Test if pmount-hal exists
if ( usermode ) {
- if ( !command_exists( "pmount-hal &> /dev/null" ) ) {
+ if ( !command_exists( "pmount-hal > /dev/null 2>&1" ) ) {
DEBUG(_("pmount-hal was not found on your system.\n"));
}
else {
- if ( !command_exists( "pumount &> /dev/null" ) ) {
+ if ( !command_exists( "pumount > /dev/null 2>&1" ) ) {
DEBUG(_("pmount-hal was found on your system, but pumount "
"wasn't!\n"));
}
@@ -284,20 +284,33 @@
return;
}
}
+ // Test if gnome-mount exists
+ if ( !command_exists( "gnome-mount > /dev/null 2>&1" ) ) {
+ DEBUG(_("gnome-mount was not found on your system.\n"));
+ }
+ else {
+ DEBUG(_
+ ("gnome-mount was found on your system. It will be "
+ "used for mounting.\n"));
+ known_mount_command = "gnome-mount -h '$hal.info.udi$'";
+ unknown_mount_command = known_mount_command;
+ umount_command = "gnome-mount -u -d '$hal.block.device$'";
+ return;
+ }
}
else {
DEBUG(_
- ("pmount-hal detection skipped, as we are a root instance "
- "of Ivman. pmount-hal is only used for user instances.\n"));
+ ("pmount-hal/gnome-mount detection skipped, as we are a root instance "
+ "of Ivman. pmount-hal/gnome-mount is only used for user instances.\n"));
}
// Now try looking for regular pmount.
- if ( !command_exists( "pmount &> /dev/null" ) ) {
+ if ( !command_exists( "pmount > /dev/null 2>&1" ) ) {
DEBUG(_("pmount was not found on your system.\n"));
}
else {
- if ( !command_exists( "pumount &> /dev/null" ) ) {
+ if ( !command_exists( "pumount > /dev/null 2>&1" ) ) {
DEBUG(_
("pmount was found on your system, but pumount "
"wasn't!\n"));
@@ -323,7 +336,7 @@
g_string_append( pmount_umask_check, " --help | " );
pmount_umask_check =
g_string_append( pmount_umask_check, GREP_PATH
- " -- '-u <' &> /dev/null");
+ " -- '-u <' > /dev/null 2>&1");
gboolean umask_accepted =
command_succeeds( pmount_umask_check->str );
@@ -366,12 +379,12 @@
// At the bottom of the barrel is plain old mount ...
- if ( !command_exists( "mount &> /dev/null" ) ) {
+ if ( !command_exists( "mount > /dev/null 2>&1" ) ) {
DEBUG(_("mount was not found on your system.\n"));
}
else {
- if ( !command_exists( "umount &> /dev/null" ) ) {
+ if ( !command_exists( "umount > /dev/null 2>&1" ) ) {
DEBUG(_
("mount was found on your system, but umount was "
"not!\n"));
@@ -650,12 +663,17 @@
|| libhal_device_property_exists(hal_ctx, udi,
propertyname, &dbus_error))
{
- unsigned int type = execun ? psi_get_property_type(hal_ps,
- propertyname)
- : libhal_device_get_property_type(hal_ctx,
+ unsigned int type;
+
+ ivm_check_dbus_error(&dbus_error);
+
+ type = execun ? psi_get_property_type(hal_ps,
+ propertyname)
+ : libhal_device_get_property_type(hal_ctx,
udi,
propertyname,
&dbus_error);
+ ivm_check_dbus_error(&dbus_error);
if (type == DBUS_TYPE_STRING)
{
@@ -811,6 +829,7 @@
libhal_device_get_property_string(hal_ctx, udi,
"volume.mount_point",
&dbus_error);
+ ivm_check_dbus_error(&dbus_error);
if (!libhal_device_property_exists
(hal_ctx, udi, "block.device", &dbus_error))
@@ -886,24 +905,31 @@
udi,
"block.storage_device",
&dbus_error ) ) {
-
+
+ ivm_check_dbus_error(&dbus_error);
+
char * parent_udi = libhal_device_get_property_string(
hal_ctx,
udi,
"block.storage_device",
&dbus_error);
+ ivm_check_dbus_error(&dbus_error);
+
if ( libhal_device_property_exists(
hal_ctx,
parent_udi,
"storage.policy.desired_mount_point",
&dbus_error) ) {
-
+
+ ivm_check_dbus_error(&dbus_error);
+
char * mount_point = libhal_device_get_property_string(
hal_ctx,
parent_udi,
"storage.policy.desired_mount_point",
&dbus_error);
-
+ ivm_check_dbus_error(&dbus_error);
+
GString * command = g_string_new( known_mount_command );
int strsize = strlen( "$hal.volume.policy.desired_mount_point$" );
int index =
@@ -959,12 +985,12 @@
char *device = NULL;
if (libhal_device_property_exists
- (hal_ctx, udi, "block.device", &dbus_error))
+ (hal_ctx, udi, "block.device", NULL))
device =
(char *)
libhal_device_get_property_string(hal_ctx,
udi,
- "block.device", &dbus_error);
+ "block.device", NULL);
if (cfg->mount)
{
@@ -980,10 +1006,10 @@
if (libhal_device_property_exists(hal_ctx, udi,
"volume.is_mounted",
- &dbus_error)
+ NULL)
&& !libhal_device_get_property_bool(hal_ctx, udi,
"volume.is_mounted",
- &dbus_error))
+ NULL))
{
DEBUG(_("Attempting to mount device %s\n"), device);
ivm_device_mount(udi);
@@ -993,12 +1019,12 @@
if ((!libhal_device_property_exists(hal_ctx, udi,
"volume.is_mounted",
- &dbus_error))
+ NULL))
||
(!libhal_device_get_property_bool
- (hal_ctx, udi, "volume.is_mounted", &dbus_error))
+ (hal_ctx, udi, "volume.is_mounted", NULL))
||
- (!libhal_device_property_exists(hal_ctx, udi, "volume.mount_point", &dbus_error))
+ (!libhal_device_property_exists(hal_ctx, udi, "volume.mount_point", NULL))
)
{
DEBUG(_("%s wasn't mounted, by us or by others..."), udi);
@@ -1014,7 +1040,7 @@
char *mount_point = (char *)
libhal_device_get_property_string(hal_ctx, udi,
"volume.mount_point",
- &dbus_error);
+ NULL);
while (( !mount_point || (strlen(mount_point) < 2) )
&& (i < 5))
@@ -1023,7 +1049,7 @@
mount_point = (char *)
libhal_device_get_property_string(hal_ctx, udi,
" volume.mount_point ",
- &dbus_error);
+ NULL);
i++;
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org