Hello community, here is the log from the commit of package gphoto for openSUSE:Factory checked in at Wed Aug 4 23:28:26 CEST 2010. -------- --- GNOME/gphoto/gphoto.changes 2010-04-11 23:23:11.000000000 +0200 +++ gphoto/gphoto.changes 2010-06-18 09:14:41.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Jun 18 09:14:21 CEST 2010 - meissner@suse.de + +- merge over the wait event loop fix from the branch. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- gphoto2-branch.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gphoto.spec ++++++ --- /var/tmp/diff_new_pack.NcCYww/_old 2010-08-04 23:27:03.000000000 +0200 +++ /var/tmp/diff_new_pack.NcCYww/_new 2010-08-04 23:27:03.000000000 +0200 @@ -24,8 +24,9 @@ Group: Hardware/Camera Summary: A Digital Camera Utility Version: 2.4.9 -Release: 1 +Release: 4 Source0: %{name}2-%{version}.tar.bz2 +Patch0: gphoto2-branch.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -43,6 +44,7 @@ %prep %setup -q -n gphoto2-%{version} +%patch0 -p1 %build %configure \ ++++++ gphoto2-branch.patch ++++++ diff -ru gphoto2-2.4.9/gphoto2/main.c gphoto2//gphoto2/main.c --- gphoto2-2.4.9/gphoto2/main.c 2010-04-07 22:49:12.000000000 +0200 +++ gphoto2//gphoto2/main.c 2010-06-18 09:02:22.299968000 +0200 @@ -691,6 +691,7 @@ evtype = GP_EVENT_UNKNOWN; result = gp_camera_wait_for_event(gp_params.camera, waittime, type, &data, gp_params.context); if (result == GP_ERROR_NOT_SUPPORTED) { + *type = GP_EVENT_TIMEOUT; usleep(waittime*1000); return GP_OK; } @@ -1584,9 +1585,12 @@ fprintf (stderr, _("Operation cancelled.\n")); return; } - - fprintf (stderr, _("*** Error (%i: '%s') *** \n\n"), result, - gp_result_as_string (result)); + if (result == -2000) { + fprintf (stderr, _("*** Error: No camera found. ***\n\n")); + } else { + fprintf (stderr, _("*** Error (%i: '%s') *** \n\n"), result, + gp_result_as_string (result)); + } if (!debug_option_given) { int n; printf (_("For debugging messages, please use " @@ -2059,6 +2063,7 @@ CR_MAIN (action_camera_set_port (&gp_params, path)); } else if (!count) { + int ret; /* * No camera detected. Have a look at the settings. * Ignore errors here, it might be a serial one. @@ -2067,7 +2072,12 @@ action_camera_set_model (&gp_params, buf); if (gp_setting_get ("gphoto2", "port", buf) >= 0) action_camera_set_port (&gp_params, buf); - + ret = gp_camera_init (gp_params.camera, gp_params.context); + if (ret != GP_OK) { + if (ret == GP_ERROR_BAD_PARAMETERS) + ret = -2000; + CR_MAIN (ret); + } } else { /* If --port override, search the model with the same port. */ if (info.type != GP_PORT_NONE) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org