May 2007 - openSUSE Commits - openSUSE Mailing Lists

commit ddclient
by root＠Hilbert.suse.de 03 May '07

03 May '07

Hello community, here is the log from the commit of package ddclient checked in at Thu May 3 23:57:41 CEST 2007. -------- --- ddclient/ddclient.changes 2007-04-03 20:38:43.000000000 +0200 +++ /mounts/work_src_done/STABLE/ddclient/ddclient.changes 2007-05-03 14:28:35.877923000 +0200 @@ -1,0 +2,6 @@ +Thu May 3 14:26:56 CEST 2007 - kssingvo(a)suse.de + +- added sysconfig file, as suggested in bugzilla#268138 +- added /var/cache/ddclient (bugzilla#268138) + +------------------------------------------------------------------- New: ---- ddclient-3.7.1-sysconfig.patch ddclient.sysconfig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ddclient.spec ++++++ --- /var/tmp/diff_new_pack.S29669/_old 2007-05-03 23:54:35.000000000 +0200 +++ /var/tmp/diff_new_pack.S29669/_new 2007-05-03 23:54:35.000000000 +0200 @@ -17,15 +17,17 @@ Suggests: perl-IO-Socket-SSL Autoreqprov: on Version: 3.7.1 -Release: 9 +Release: 15 URL: http://ddclient.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: A Perl Client to Update Dynamic DNS Entries Source0: http://switch.dl.sourceforge.net/sourceforge/ddclient/%{name}-%{version}.ta… Source1: rc.ddclient +Source2: ddclient.sysconfig Patch0: ddclient-3.6.3-config.patch Patch1: ddclient-3.7.1-config.patch Patch2: ddclient-3.7.1-fw_debug.patch +Patch3: ddclient-3.7.1-sysconfig.patch %description ddclient is a small full-featured client requiring only Perl. Supported @@ -51,6 +53,7 @@ %patch0 -p1 -b _orig %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build #export CFLAGS="$RPM_OPT_FLAGS" @@ -72,10 +75,15 @@ mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/init.d install -m 755 %{name} $RPM_BUILD_ROOT/usr/sbin/ install -m 644 sample-etc_ddclient.conf $RPM_BUILD_ROOT/%{_sysconfdir}/ddclient.conf -# init script +# init script and config file install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/ddclient ln -s %{_sysconfdir}/init.d/ddclient $RPM_BUILD_ROOT/usr/sbin/rcddclient +install -d -m 755 $RPM_BUILD_ROOT/var/adm/fillup-templates +install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.ddclient +install -d -m 755 $RPM_BUILD_ROOT/var/cache/ddclient +%post +%{fillup_only} %preun %stop_on_removal ddclient @@ -94,9 +102,14 @@ %config %attr(0755,root,root) /etc/init.d/ddclient /usr/sbin/%{name} /usr/sbin/rcddclient +/var/adm/fillup-templates/sysconfig.ddclient +%dir /var/cache/ddclient %doc COPY* README* sample* %changelog +* Thu May 03 2007 - kssingvo(a)suse.de +- added sysconfig file, as suggested in bugzilla#268138 +- added /var/cache/ddclient (bugzilla#268138) * Tue Apr 03 2007 - kssingvo(a)suse.de - fixed issue in debug messages (bugzilla#250170) * Tue Feb 13 2007 - kssingvo(a)suse.de ++++++ ddclient-3.7.1-sysconfig.patch ++++++ --- ddclient-3.7.1/sample-etc_ddclient.conf.orig 2007-05-03 14:25:43.000000000 +0200 +++ ddclient-3.7.1/sample-etc_ddclient.conf 2007-05-03 14:29:36.000000000 +0200 @@ -18,6 +18,7 @@ ## are mentioned here. ## ###################################################################### +# daemon: consider to use /etc/sysconfig/ddclient instead of modifying here daemon=300 # check every 300 seconds syslog=yes # log update msgs to syslog #mail=root # mail all msgs to root ++++++ rc.ddclient ++++++ --- ddclient/rc.ddclient 2007-01-08 12:31:15.000000000 +0100 +++ /mounts/work_src_done/STABLE/ddclient/rc.ddclient 2007-05-03 14:25:18.611387000 +0200 @@ -28,17 +28,22 @@ # Source SuSE config, only if exists with size greater zero test -s /etc/rc.status && . /etc/rc.status +DDCLIENT_SYSCONFIG=/etc/sysconfig/ddclient DDCLIENT_CONFIG=/etc/ddclient.conf DDCLIENT_BIN=/usr/sbin/ddclient test -s "$DDCLIENT_CONFIG" || exit 6 +test -s "$DDCLIENT_SYSCONFIG" && . "$DDCLIENT_SYSCONFIG" + +dd_intervall=${DDCLIENT_INTERVALL:-300} + rc_reset case "$1" in start) echo -n "Starting ddclient daemon" - startproc "$DDCLIENT_BIN" -daemon 300 + startproc "$DDCLIENT_BIN" -daemon $dd_intervall $DDCLIENT_OPTIONS rc_status -v ;; stop) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit desktop-file-utils
by root＠Hilbert.suse.de 03 May '07

03 May '07

Hello community, here is the log from the commit of package desktop-file-utils checked in at Thu May 3 23:54:28 CEST 2007. -------- --- desktop-file-utils/desktop-file-utils.changes 2007-04-27 15:58:17.000000000 +0200 +++ /mounts/work_src_done/STABLE/desktop-file-utils/desktop-file-utils.changes 2007-05-02 22:10:30.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 2 22:10:21 CEST 2007 - dmueller(a)suse.de + +- add patch to validate suse keys + +------------------------------------------------------------------- New: ---- suse-keys.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ desktop-file-utils.spec ++++++ --- /var/tmp/diff_new_pack.b26910/_old 2007-05-03 23:53:49.000000000 +0200 +++ /var/tmp/diff_new_pack.b26910/_new 2007-05-03 23:53:49.000000000 +0200 @@ -16,10 +16,11 @@ Group: Development/Tools/Other Autoreqprov: on Version: 0.12 -Release: 11 +Release: 13 Source: %{name}-%{version}.tar.bz2 Source1: SuSEconfig.desktop-file-utils Patch: desktop-file-utils-0.11-encoding.patch +Patch1: suse-keys.diff PreReq: /bin/rm /bin/rmdir Requires: /etc/profile.d/xdg-enviroment.sh URL: http://www.freedesktop.org/wiki/Software_2fdesktop_2dfile_2dutils @@ -43,6 +44,7 @@ %prep %setup %patch -p1 +%patch1 %build %configure\ @@ -92,6 +94,8 @@ %ghost /opt/kde3/share/applications/mimeinfo.cache %changelog +* Wed May 02 2007 - dmueller(a)suse.de +- add patch to validate suse keys * Fri Apr 27 2007 - sbrabec(a)suse.cz - Fixed invalid error for missing "Encoding" (Freedesktop#10093). * Thu Apr 19 2007 - sbrabec(a)suse.cz ++++++ suse-keys.diff ++++++ --- src/validate.c +++ src/validate.c @@ -495,6 +495,7 @@ struct { { "MapNotify", validate_string, TRUE }, /* 0.9.3: deprecated */ { "Protocols", validate_string, TRUE }, /* 0.9.3: deprecated */ { "ServiceTypes", validate_string }, /* 0.9.4: within KDE only */ + { "X-SuSE-translate", validate_boolean }, }; static void ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit wodim
by root＠Hilbert.suse.de 03 May '07

03 May '07

Hello community, here is the log from the commit of package wodim checked in at Thu May 3 23:52:32 CEST 2007. -------- --- wodim/wodim.changes 2007-04-24 11:33:42.000000000 +0200 +++ /mounts/work_src_done/STABLE/wodim/wodim.changes 2007-05-03 18:26:11.000000000 +0200 @@ -1,0 +2,5 @@ +Thu May 3 18:24:39 CEST 2007 - nadvornik(a)suse.cz + +- fixed crash on hidden boot catalog directory [#247950] + +------------------------------------------------------------------- New: ---- cdrkit-1.1.5.1-eltorito.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wodim.spec ++++++ --- /var/tmp/diff_new_pack.g18120/_old 2007-05-03 23:48:20.000000000 +0200 +++ /var/tmp/diff_new_pack.g18120/_new 2007-05-03 23:48:20.000000000 +0200 @@ -17,11 +17,12 @@ PreReq: permissions Autoreqprov: on Version: 1.1.5.1 -Release: 1 +Release: 5 Source: cdrkit-%{version}.tar.gz Source1: scan_scsi.linux Source2: cdinfo.c Source5: README.SUSE +Patch1: cdrkit-%{version}-eltorito.patch URL: http://cdrkit.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Tool for Writing CDRs @@ -122,6 +123,7 @@ %prep %setup -q -n cdrkit-%{version} +%patch1 %build export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" @@ -263,6 +265,8 @@ /usr/bin/list_audio_tracks %changelog +* Thu May 03 2007 - nadvornik(a)suse.cz +- fixed crash on hidden boot catalog directory [#247950] * Tue Apr 24 2007 - nadvornik(a)suse.cz - update to cdrkit-1.1.5.1 - experimental Large File Support with UDF filesystem ++++++ cdrkit-1.1.5.1-eltorito.patch ++++++ --- genisoimage/eltorito.c +++ genisoimage/eltorito.c @@ -228,6 +228,15 @@ iso9660_file_length(p2, s_entry, 0); /* flag file as necessary */ + + /* + * If the current directory is hidden, then hide this entry + */ + if (this_dir->dir_flags & INHIBIT_ISO9660_ENTRY) + bcat_de_flags |= INHIBIT_ISO9660_ENTRY; + if (this_dir->dir_flags & INHIBIT_JOLIET_ENTRY) + bcat_de_flags |= INHIBIT_JOLIET_ENTRY; + s_entry->de_flags = bcat_de_flags; if ((use_XA || use_RockRidge) && ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit virt-manager
by root＠Hilbert.suse.de 03 May '07

03 May '07

Hello community, here is the log from the commit of package virt-manager checked in at Thu May 3 23:48:14 CEST 2007. -------- --- arch/i386/virt-manager/virt-manager.changes 2007-04-02 01:56:43.000000000 +0200 +++ /mounts/work_src_done/STABLE/virt-manager/virt-manager.changes 2007-05-03 22:50:10.000000000 +0200 @@ -1,0 +2,25 @@ +Thu May 3 14:50:03 MDT 2007 - ccoffing(a)novell.com + +- Fix syntax error, which could result in unnecessary VNC + connection failures. (#237406) + +------------------------------------------------------------------- +Fri Apr 27 13:20:07 MDT 2007 - ccoffing(a)novell.com + +- Update to 0.4.0. +- Clean up spec file. + +------------------------------------------------------------------- +Tue Apr 10 14:19:36 MDT 2007 - ccoffing(a)novell.com + +- Remove code that (incorrectly) guesses the vnc port. (#259692) +- Do not refresh GUI every second (which causes xenstored to not + thrash so badly, which makes virt-manager more responsive and + less likely to time out or lock up). Partial fix for #237406. +- Import changeset 440, which makes virt-manager honor dom0's + keymap. (#241149) +- Revert patch for bug #244772, because it causes lockups, as + noted in bug #261110. +- Fix attaching disks to running VM. (#238986) + +------------------------------------------------------------------- @@ -4 +29,50 @@ -- updated gconf scriptlets +- updated gconf scriptlets + +------------------------------------------------------------------- +Wed Mar 28 11:37:48 MDT 2007 - ccoffing(a)novell.com + +- Update icon filename. + +------------------------------------------------------------------- +Tue Mar 13 15:25:13 MDT 2007 - ccoffing(a)novell.com + +- Import threading and timer tick patches from upstream to improve + stability. (#237406 and others) +- Do not offer QEMU option. (#254083) + +------------------------------------------------------------------- +Mon Mar 12 08:44:33 MDT 2007 - ccoffing(a)novell.com + +- Update virt-manager to match changes in vm-install's disk class, + due to bug #247849. + +------------------------------------------------------------------- +Fri Mar 9 17:52:21 MST 2007 - ccoffing(a)novell.com + +- Make Ctrl+Alt release the mouse cursor (#252998). + +------------------------------------------------------------------- +Thu Mar 8 12:38:56 MST 2007 - ccoffing(a)novell.com + +- Add release to "Requires: xen-tools", to prevent mixing with + pre-beta 5. (#238986, #252495) + +------------------------------------------------------------------- +Fri Mar 2 17:53:44 MST 2007 - ccoffing(a)novell.com + +- Disable gtk-menu-bar-accel when VM has focus, to allow VM to get + F10 key. (#240001) + +------------------------------------------------------------------- +Tue Feb 27 13:36:06 MST 2007 - ccoffing(a)novell.com + +- Update to 0.3.1. +- "Requires: librsvg" (#250156) +- Re-use vm-install's disk UI, to allow disks to be added/removed + from xend-managed VMs (currently only for running VMs). (#238986) + +------------------------------------------------------------------- +Thu Feb 22 12:39:37 MST 2007 - ccoffing(a)novell.com + +- If Xen isn't running, put up error window instead of raising. + (#244772) Old: ---- virt-manager-0.3.0.tar.bz2 virtman-deprecated-raise.diff virtman-error.diff virtman-no-ungrab.diff New: ---- virt-manager-0.4.0.tar.bz2 virtman-edit.diff virtman-typo.diff virtman-wrong-port.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virt-manager.spec ++++++ --- /var/tmp/diff_new_pack.b14531/_old 2007-05-03 23:46:26.000000000 +0200 +++ /var/tmp/diff_new_pack.b14531/_new 2007-05-03 23:46:26.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package virt-manager (Version 0.3.0) +# spec file for package virt-manager (Version 0.4.0) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,44 +12,36 @@ Name: virt-manager URL: http://virt-manager.et.redhat.com -BuildRequires: autoconf automake gconf2 gettext gtk2-devel python-devel python-gtk update-desktop-files -%if %suse_version > 1010 -BuildRequires: python-gobject2-devel python-gtk-devel -%define gsysconfdir /etc -%define gconftool /usr/bin/gconftool-2 -%else -%define gsysconfdir /etc/opt/gnome -%define gconftool /opt/gnome/bin/gconftool-2 -%endif +BuildRequires: autoconf automake gconf2 gettext gtk2-devel python-devel python-gobject2-devel python-gtk-devel scrollkeeper update-desktop-files +# Only for directory ownership: +BuildRequires: libgnome yast2 License: GNU General Public License (GPL) Group: System/Monitoring Autoreqprov: yes -Version: 0.3.0 -Release: 8 +Version: 0.4.0 +Release: 1 Summary: Virtual Machine Manager -Source0: virt-manager-0.3.0.tar.bz2 +Source0: virt-manager-0.4.0.tar.bz2 Source1: rhpl-exception.py +Patch10: virtman-desktop.diff +Patch11: virtman-install.diff +Patch12: virtman-type-register.diff +Patch13: virtman-console-keys.diff +Patch14: virtman-detach-yast.diff +Patch15: virtman-limit-popup.diff +Patch16: virtman-edit.diff +Patch17: virtman-wrong-port.diff +Patch18: virtman-typo.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build +ExclusiveArch: %ix86 x86_64 Requires: python-gtk Requires: python-gnome -# Absolutely require this version or newer Requires: libvirt-python >= 0.1.4-3 -# FIXME: Check dbus-1-python 0.60 vs. 0.61 API changes Requires: dbus-1-python -# Minimum we've tested with -Requires: libxml2-python >= 2.6.23 +Requires: libxml2-python Requires: vte -Requires: xen-tools >= 3.0.4_13100 -ExclusiveArch: %ix86 x86_64 -Patch0: virtman-desktop.diff -Patch1: virtman-install.diff -Patch2: virtman-type-register.diff -Patch3: virtman-deprecated-raise.diff -Patch5: virtman-console-keys.diff -Patch6: virtman-detach-yast.diff -Patch7: virtman-no-ungrab.diff -Patch8: virtman-limit-popup.diff -Patch9: virtman-error.diff +Requires: librsvg +Requires: xen-tools >= 3.0.4_13138-0.10 Requires: gconf2 %gconf_schemas_prereq @@ -68,40 +60,33 @@ %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 +%patch10 -p1 +%patch11 -p1 +%patch12 -p1 +%patch13 -p1 +%patch14 -p1 +%patch15 -p1 +#%patch16 -p1 # re-port... or not? +%patch17 -p1 +%patch18 -p1 %build -#automake -#autoconf autoreconf -i -%configure --sysconfdir=%{gsysconfdir} +%configure make %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -rm -f $RPM_BUILD_ROOT%{_libdir}/virt-manager/sparkline.a -rm -f $RPM_BUILD_ROOT%{_libdir}/virt-manager/sparkline.la +rm -f $RPM_BUILD_ROOT%{_libdir}/virt-manager/sparkline.{a,la} install -m755 %SOURCE1 $RPM_BUILD_ROOT%{_datadir}/virt-manager/exception.py -mkdir -p $RPM_BUILD_ROOT%{_sbindir} -# Unsupported languages: -rm -rf $RPM_BUILD_ROOT/usr/share/locale/as -rm -rf $RPM_BUILD_ROOT/usr/share/locale/or -%find_lang virt-manager %find_gconf_schemas +%find_lang %{name} cat %{name}.schemas_list %{name}.lang >%{name}.lst -%suse_update_desktop_file virt-manager +%suse_update_desktop_file %{name} %clean -rm -rf $RPM_BUILD_ROOT +test ! -z "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" && rm -rf $RPM_BUILD_ROOT %pre -f %{name}.schemas_pre @@ -109,14 +94,14 @@ %posttrans -f %{name}.schemas_posttrans -%files -f virt-manager.lst +%files -f %{name}.lst %defattr(-,root,root,-) %doc COPYING AUTHORS ChangeLog -%{gsysconfdir}/gconf/schemas/virt-manager.schemas %{_bindir}/virt-manager %{_libexecdir}/virt-manager-launch %{_libdir}/virt-manager/ %dir %{_datadir}/virt-manager +%{_datadir}/omf/virt-manager/ %{_datadir}/virt-manager/*.glade %dir %{_datadir}/virt-manager/pixmaps %{_datadir}/virt-manager/pixmaps/*.png @@ -128,14 +113,51 @@ %{_datadir}/virt-manager/vncViewer/*.py %{_datadir}/applications/YaST2/virt-manager.desktop %{_datadir}/dbus-1/services/virt-manager.service -# FIXME: autobuild complains that these are unowned (not true...) -%dir %{_datadir}/dbus-1 -%dir %{_datadir}/dbus-1/services -%dir %{_datadir}/applications/YaST2 %changelog +* Thu May 03 2007 - ccoffing(a)novell.com +- Fix syntax error, which could result in unnecessary VNC + connection failures. (#237406) +* Fri Apr 27 2007 - ccoffing(a)novell.com +- Update to 0.4.0. +- Clean up spec file. +* Tue Apr 10 2007 - ccoffing(a)novell.com +- Remove code that (incorrectly) guesses the vnc port. (#259692) +- Do not refresh GUI every second (which causes xenstored to not + thrash so badly, which makes virt-manager more responsive and + less likely to time out or lock up). Partial fix for #237406. +- Import changeset 440, which makes virt-manager honor dom0's + keymap. (#241149) +- Revert patch for bug #244772, because it causes lockups, as + noted in bug #261110. +- Fix attaching disks to running VM. (#238986) * Mon Apr 02 2007 - ro(a)suse.de - updated gconf scriptlets +* Wed Mar 28 2007 - ccoffing(a)novell.com +- Update icon filename. +* Tue Mar 13 2007 - ccoffing(a)novell.com +- Import threading and timer tick patches from upstream to improve + stability. (#237406 and others) +- Do not offer QEMU option. (#254083) +* Mon Mar 12 2007 - ccoffing(a)novell.com +- Update virt-manager to match changes in vm-install's disk class, + due to bug #247849. +* Fri Mar 09 2007 - ccoffing(a)novell.com +- Make Ctrl+Alt release the mouse cursor (#252998). +* Thu Mar 08 2007 - ccoffing(a)novell.com +- Add release to "Requires: xen-tools", to prevent mixing with + pre-beta 5. (#238986, #252495) +* Fri Mar 02 2007 - ccoffing(a)novell.com +- Disable gtk-menu-bar-accel when VM has focus, to allow VM to get + F10 key. (#240001) +* Tue Feb 27 2007 - ccoffing(a)novell.com +- Update to 0.3.1. +- "Requires: librsvg" (#250156) +- Re-use vm-install's disk UI, to allow disks to be added/removed + from xend-managed VMs (currently only for running VMs). (#238986) +* Thu Feb 22 2007 - ccoffing(a)novell.com +- If Xen isn't running, put up error window instead of raising. + (#244772) * Tue Feb 13 2007 - ccoffing(a)novell.com - Update to latest hg; grabs mouse for better mouse tracking. (#240387) ++++++ virt-manager-0.3.0.tar.bz2 -> virt-manager-0.4.0.tar.bz2 ++++++ ++++ 140657 lines of diff (skipped) ++++++ virtman-console-keys.diff ++++++ --- /var/tmp/diff_new_pack.b14531/_old 2007-05-03 23:46:28.000000000 +0200 +++ /var/tmp/diff_new_pack.b14531/_new 2007-05-03 23:46:28.000000000 +0200 @@ -1,8 +1,8 @@ -Index: virt-manager-0.3.0/src/virtManager/console.py +Index: virt-manager-0.4.0/src/virtManager/console.py =================================================================== ---- virt-manager-0.3.0.orig/src/virtManager/console.py -+++ virt-manager-0.3.0/src/virtManager/console.py -@@ -45,6 +45,8 @@ class vmmConsole(gobject.GObject): +--- virt-manager-0.4.0.orig/src/virtManager/console.py ++++ virt-manager-0.4.0/src/virtManager/console.py +@@ -49,6 +49,8 @@ class vmmConsole(gobject.GObject): self.vm = vm topwin = self.window.get_widget("vmm-console") @@ -11,7 +11,7 @@ topwin.hide() self.title = vm.get_name() + " " + topwin.get_title() topwin.set_title(self.title) -@@ -52,9 +54,9 @@ class vmmConsole(gobject.GObject): +@@ -56,9 +58,9 @@ class vmmConsole(gobject.GObject): self.window.get_widget("control-shutdown").get_icon_widget().set_from_file(config.get_icon_dir() + "/icon_shutdown.png") if self.config.get_console_keygrab() == 2: @@ -23,11 +23,11 @@ self.vncViewer.connect("pointer-grabbed", self.notify_grabbed) self.vncViewer.connect("pointer-ungrabbed", self.notify_ungrabbed) -Index: virt-manager-0.3.0/src/vncViewer/vnc.py +Index: virt-manager-0.4.0/src/vncViewer/vnc.py =================================================================== ---- virt-manager-0.3.0.orig/src/vncViewer/vnc.py -+++ virt-manager-0.3.0/src/vncViewer/vnc.py -@@ -179,7 +179,7 @@ class GRFBViewer(gtk.DrawingArea): +--- virt-manager-0.4.0.orig/src/vncViewer/vnc.py ++++ virt-manager-0.4.0/src/vncViewer/vnc.py +@@ -190,7 +190,7 @@ class GRFBViewer(gtk.DrawingArea): "keyboard-ungrabbed": (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, []), } @@ -36,7 +36,7 @@ gtk.DrawingArea.__init__(self) self.fb = GRFBFrameBuffer(self) -@@ -189,6 +189,7 @@ class GRFBViewer(gtk.DrawingArea): +@@ -200,6 +200,7 @@ class GRFBViewer(gtk.DrawingArea): self.autograbkey = autograbkey self.autograbptr = True self.topwin = topwin @@ -44,21 +44,21 @@ self.accel_groups = gtk.accel_groups_from_object(topwin) self.preferred_encoding = (rfb.ENCODING_RAW, rfb.ENCODING_DESKTOP_RESIZE) # Current impl of draw_solid is *far* too slow to be practical -@@ -445,6 +446,8 @@ class GRFBViewer(gtk.DrawingArea): +@@ -460,6 +461,8 @@ class GRFBViewer(gtk.DrawingArea): gtk.gdk.keyboard_grab(self.window, False, long(0)) for g in self.accel_groups: self.topwin.remove_accel_group(g) + for w in self.sens: + w.set_sensitive(False) - self.grabbedKeyboard = True - self.emit("keyboard-grabbed") - -@@ -452,6 +455,8 @@ class GRFBViewer(gtk.DrawingArea): + self.gtk_settings = gtk.settings_get_default() + self.gtk_settings_accel = self.gtk_settings.get_property('gtk-menu-bar-accel') + self.gtk_settings.set_property('gtk-menu-bar-accel', None) +@@ -470,6 +473,8 @@ class GRFBViewer(gtk.DrawingArea): gtk.gdk.keyboard_ungrab() for g in self.accel_groups: self.topwin.add_accel_group(g) + for w in self.sens: + w.set_sensitive(True) + self.gtk_settings.set_property('gtk-menu-bar-accel', self.gtk_settings_accel) self.grabbedKeyboard = False self.emit("keyboard-ungrabbed") - ++++++ virtman-desktop.diff ++++++ --- /var/tmp/diff_new_pack.b14531/_old 2007-05-03 23:46:28.000000000 +0200 +++ /var/tmp/diff_new_pack.b14531/_new 2007-05-03 23:46:28.000000000 +0200 @@ -1,7 +1,7 @@ -Index: virt-manager-0.3.0/src/virt-manager.desktop.in +Index: virt-manager-0.4.0/src/virt-manager.desktop.in =================================================================== ---- virt-manager-0.3.0.orig/src/virt-manager.desktop.in -+++ virt-manager-0.3.0/src/virt-manager.desktop.in +--- virt-manager-0.4.0.orig/src/virt-manager.desktop.in ++++ virt-manager-0.4.0/src/virt-manager.desktop.in @@ -1,9 +1,17 @@ [Desktop Entry] +Version=1.0 @@ -21,15 +21,15 @@ +X-SuSE-YaST-RootOnly=true +X-SuSE-YaST-Geometry= +X-SuSE-YaST-SortKey= -+Icon=yast-network ++Icon=yast-vm-management +X-SuSE-translate=true -Index: virt-manager-0.3.0/src/Makefile.am +Index: virt-manager-0.4.0/src/Makefile.am =================================================================== ---- virt-manager-0.3.0.orig/src/Makefile.am -+++ virt-manager-0.3.0/src/Makefile.am +--- virt-manager-0.4.0.orig/src/Makefile.am ++++ virt-manager-0.4.0/src/Makefile.am @@ -14,7 +14,7 @@ libexec_SCRIPTS = $(PACKAGE)-launch gladedir = $(pkgdatadir) - glade_DATA = $(PACKAGE).glade + glade_DATA = $(wildcard $(srcdir)/*.glade) -desktopdir = $(datadir)/applications +desktopdir = $(datadir)/applications/YaST2/ ++++++ virtman-detach-yast.diff ++++++ --- /var/tmp/diff_new_pack.b14531/_old 2007-05-03 23:46:28.000000000 +0200 +++ /var/tmp/diff_new_pack.b14531/_new 2007-05-03 23:46:28.000000000 +0200 @@ -1,8 +1,8 @@ -Index: virt-manager-0.3.0/src/virt-manager.py.in +Index: virt-manager-0.4.0/src/virt-manager.py.in =================================================================== ---- virt-manager-0.3.0.orig/src/virt-manager.py.in -+++ virt-manager-0.3.0/src/virt-manager.py.in -@@ -148,6 +148,8 @@ def main(): +--- virt-manager-0.4.0.orig/src/virt-manager.py.in ++++ virt-manager-0.4.0/src/virt-manager.py.in +@@ -177,6 +177,8 @@ def main(): optParser = OptionParser() optParser.add_option("--profile", dest="profile", help="Generate runtime performance profile stats", metavar="FILE") optParser.set_defaults(uuid=None) @@ -11,7 +11,7 @@ optParser.add_option("-c", "--connect", dest="uri", help="Connect to hypervisor at URI", metavar="URI") optParser.add_option("--no-dbus", action="store_true", dest="nodbus", -@@ -199,6 +201,23 @@ def main(): +@@ -228,6 +230,23 @@ def main(): logging.warning("Could not connection to session bus, disabling DBus service " + \ str(sys.exc_info()[0]) + " " + str(sys.exc_info()[1])) @@ -35,11 +35,11 @@ # Finally start the app for real show_engine(engine, options.show, options.uri, options.uuid) if options.profile != None: -Index: virt-manager-0.3.0/src/virtManager/engine.py +Index: virt-manager-0.4.0/src/virtManager/engine.py =================================================================== ---- virt-manager-0.3.0.orig/src/virtManager/engine.py -+++ virt-manager-0.3.0/src/virtManager/engine.py -@@ -229,7 +229,7 @@ class vmmEngine: +--- virt-manager-0.4.0.orig/src/virtManager/engine.py ++++ virt-manager-0.4.0/src/virtManager/engine.py +@@ -278,7 +278,7 @@ class vmmEngine: return self.connections[uri]["windowDetails"][uuid] def show_manager(self, uri): ++++++ virtman-edit.diff ++++++ Index: virt-manager-0.3.1/src/virtManager/details.py =================================================================== --- virt-manager-0.3.1.orig/src/virtManager/details.py +++ virt-manager-0.3.1/src/virtManager/details.py @@ -23,6 +23,10 @@ import gtk.glade import libvirt import sparkline import logging +import os + +import xen.install +import xen.install.gui class vmmDetails(gobject.GObject): __gsignals__ = { @@ -44,6 +48,7 @@ class vmmDetails(gobject.GObject): topwin = self.window.get_widget("vmm-details") topwin.hide() topwin.set_title(self.vm.get_name() + " " + topwin.get_title()) + self.topwin = topwin self.window.get_widget("overview-name").set_text(self.vm.get_name()) self.window.get_widget("overview-uuid").set_text(self.vm.get_uuid()) @@ -129,15 +134,14 @@ class vmmDetails(gobject.GObject): self.window.get_widget("details-toolbar").hide() def show(self): - dialog = self.window.get_widget("vmm-details") - dialog.show_all() + self.topwin.show_all() self.window.get_widget("overview-network-traffic-text").hide() self.window.get_widget("overview-network-traffic-label").hide() self.window.get_widget("overview-disk-usage-bar").hide() self.window.get_widget("overview-disk-usage-text").hide() self.window.get_widget("overview-disk-usage-label").hide() self.network_traffic_graph.hide() - dialog.present() + self.topwin.present() def activate_performance_page(self): self.window.get_widget("details-pages").set_current_page(0) @@ -146,11 +150,11 @@ class vmmDetails(gobject.GObject): self.window.get_widget("details-pages").set_current_page(1) def close(self,ignore1=None,ignore2=None): - self.window.get_widget("vmm-details").hide() + self.topwin.hide() return 1 def is_visible(self): - if self.window.get_widget("vmm-details").flags() & gtk.VISIBLE: + if self.topwin.flags() & gtk.VISIBLE: return 1 return 0 @@ -387,45 +391,109 @@ class vmmDetails(gobject.GObject): self.window.get_widget("config-memory-apply").set_sensitive(False) + def add_cdrom(self, button): + return self.add_disk(True) + + def add_harddisk(self, button): + return self.add_disk(False) + + def add_disk(self, is_cdrom): + disks = self.disks_widget.get_disks() + unused_vdevs = xen.install.get_unused_vdevs(self.options.full_virt, disks) + if len(unused_vdevs) == 0: + return + name = self.vm.get_name() + + w = gtk.Window() + self.add_disk_window = w + w.set_modal(True) + w.set_transient_for(self.topwin) + w.set_title(xen.install.msg.title_disk) + self.disk_editor = xen.install.gui.DiskEditWidget() + disk_edit_widget = self.disk_editor.get_widget() + vbox = gtk.VBox() + w.add(vbox) + vbox.pack_start(disk_edit_widget, False) + bbox = gtk.HButtonBox() + bbox.set_layout(gtk.BUTTONBOX_END) + cancel_button = gtk.Button(stock=gtk.STOCK_CANCEL) + bbox.pack_start(cancel_button) + ok_button = gtk.Button(stock=gtk.STOCK_OK) + bbox.pack_start(ok_button) + vbox.pack_start(bbox, False) + + ok_button.connect("clicked", self.do_add_disk) + cancel_button.connect("clicked", self.do_cancel_disk) + + if is_cdrom: + cdrom = self.disk_editor.default_cdrom() + disk = xen.install.XenDisk(pdev=cdrom, vdev=unused_vdevs[0], + vdevType=xen.install.XenDisk.DEVICE_CDROM, + options=self.options, disk_group=disks) + else: + disk = xen.install.XenDisk(pdev=None, vdev=unused_vdevs[0], + vdevType=xen.install.XenDisk.DEVICE_DISK, + mb=4096, sparse=True, + options=self.options, disk_group=disks) + self.disk_editor.set(disk) + w.show_all() + w.present() + + def do_add_disk(self, button): + disks = self.disks_widget.get_disks() + disk = self.disk_editor.get() + self.xen_add_disk(disk) + disks.append(disk) + self.disks_widget.set_disks(disks) + self.add_disk_window.destroy() + + def do_cancel_disk(self, button): + self.add_disk_window.destroy() + + def xen_add_disk(self, disk): + disk.setup() + if self.vm.is_active(): + mode = 'w' + if disk.ro: + mode = 'r' + xfd = os.popen('xm block-attach %s "%s:%s" %s %s' % (self.vm.get_id(), disk.get_driver(), + disk.pdev, disk.vdev, mode)) + status = xfd.close() + else: + # FIXME + pass + + def xen_remove_disk(self, disk): + if self.vm.is_active(): + xfd = os.popen('xm block-detach %s %s -f' % (self.vm.get_id(), disk.vdev)) + status = xfd.close() + else: + # FIXME + pass def prepare_disk_list(self): - disks = self.window.get_widget("storage-view") - disksModel = gtk.TreeStore(str,str,str,str) - disks.set_model(disksModel) - - diskType_col = gtk.TreeViewColumn("Type") - diskType_text = gtk.CellRendererText() - diskType_col.pack_start(diskType_text, True) - diskType_col.add_attribute(diskType_text, 'text', 0) - - diskSrc_col = gtk.TreeViewColumn("Source") - diskSrc_text = gtk.CellRendererText() - diskSrc_col.pack_start(diskSrc_text, True) - diskSrc_col.add_attribute(diskSrc_text, 'text', 1) - - diskDevice_col = gtk.TreeViewColumn("Device") - diskDevice_text = gtk.CellRendererText() - diskDevice_col.pack_start(diskDevice_text, True) - diskDevice_col.add_attribute(diskDevice_text, 'text', 2) - - diskDst_col = gtk.TreeViewColumn(_("Destination")) - diskDst_text = gtk.CellRendererText() - diskDst_col.pack_start(diskDst_text, True) - diskDst_col.add_attribute(diskDst_text, 'text', 3) - - disks.append_column(diskType_col) - disks.append_column(diskSrc_col) - disks.append_column(diskDevice_col) - disks.append_column(diskDst_col) + self.disks_widget = xen.install.gui.DisksWidget(allow_reorder=False, + remove_fn=self.xen_remove_disk, + add_cdrom_fn=self.add_cdrom, + add_harddisk_fn=self.add_harddisk) + notebook = self.window.get_widget("hw-panel") + notebook.remove_page(2) + notebook.insert_page(self.disks_widget.get_widget(), None, 2) + class Options: + pass + self.options = Options() + self.options.full_virt = self.vm.vm.OSType() == 'hvm' + self.options.name = self.vm.get_name() def populate_disk_list(self): diskList = self.vm.get_disk_devices() - - disks = self.window.get_widget("storage-view") - disksModel = disks.get_model() - disksModel.clear() + disks = [] for d in diskList: - disksModel.append(None, d) + disks.append(xen.install.XenDisk(d[1], d[3], options=self.options, + disk_group=disks)) + max_disks = len(xen.install.get_possible_vdevs(self.options.full_virt)) + self.disks_widget.set_max_disks(max_disks) + self.disks_widget.set_disks(disks) def prepare_network_list(self): nets = self.window.get_widget("network-view") ++++++ virtman-install.diff ++++++ --- /var/tmp/diff_new_pack.b14531/_old 2007-05-03 23:46:28.000000000 +0200 +++ /var/tmp/diff_new_pack.b14531/_new 2007-05-03 23:46:28.000000000 +0200 @@ -1,17 +1,17 @@ -Index: virt-manager-0.3.0/src/virtManager/engine.py +Index: virt-manager-0.4.0/src/virtManager/engine.py =================================================================== ---- virt-manager-0.3.0.orig/src/virtManager/engine.py -+++ virt-manager-0.3.0/src/virtManager/engine.py -@@ -30,7 +30,7 @@ from virtManager.manager import vmmManag +--- virt-manager-0.4.0.orig/src/virtManager/engine.py ++++ virt-manager-0.4.0/src/virtManager/engine.py +@@ -32,7 +32,7 @@ from virtManager.manager import vmmManag from virtManager.details import vmmDetails from virtManager.console import vmmConsole from virtManager.asyncjob import vmmAsyncJob -from virtManager.create import vmmCreate -+from xen.install.gui import VMCreate as vmmCreate ++from xen.install.gui.gui import VMCreate as vmmCreate from virtManager.serialcon import vmmSerialConsole - - class vmmEngine: -@@ -38,7 +38,7 @@ class vmmEngine: + from virtManager.error import vmmErrorDialog + from virtManager.host import vmmHost +@@ -42,7 +42,7 @@ class vmmEngine: self.windowConnect = None self.windowPreferences = None self.windowAbout = None @@ -20,17 +20,17 @@ self.connections = {} self.timer = None -@@ -136,8 +136,7 @@ class vmmEngine: - ct += window.is_visible() - if conn["windowManager"]: - ct += conn["windowManager"].is_visible() +@@ -162,8 +162,7 @@ class vmmEngine: + for name in [ "windowManager", "windowHost"]: + if conn[name] != None and conn[name].is_visible(): + ct += 1 - if self.windowCreate: - ct += self.windowCreate.is_visible() + ct += len(filter(lambda w: w.is_visible(), self.windowCreate.values())) return ct def change_timer_interval(self,ignore1,ignore2,ignore3,ignore4): -@@ -245,13 +244,21 @@ class vmmEngine: +@@ -295,14 +294,21 @@ class vmmEngine: self.connections[uri]["windowManager"] = manager self.connections[uri]["windowManager"].show() @@ -42,6 +42,7 @@ - self.windowCreate = vmmCreate(self.get_config(), self.get_connection(uri, False)) - self.windowCreate.connect("action-show-console", self._do_show_console) - self.windowCreate.connect("action-show-terminal", self._do_show_terminal) +- self.windowCreate.connect("action-show-help", self._do_show_help) - self.windowCreate.reset_state() - self.windowCreate.show() + key = 0 @@ -56,5 +57,17 @@ + window.connect("vmmcreate-closing", self._create_closing) + window.show() - def get_connection(self, uri, readOnly=True): + def get_connection(self, uri, readOnly=None): if not(self.connections.has_key(uri)): +Index: virt-manager-0.4.0/src/virtManager/createnet.py +=================================================================== +--- virt-manager-0.4.0.orig/src/virtManager/createnet.py ++++ virt-manager-0.4.0/src/virtManager/createnet.py +@@ -22,7 +22,6 @@ import gtk + import gtk.gdk + import gtk.glade + import libvirt +-import virtinst + import os, sys + import logging + import dbus ++++++ virtman-limit-popup.diff ++++++ --- /var/tmp/diff_new_pack.b14531/_old 2007-05-03 23:46:28.000000000 +0200 +++ /var/tmp/diff_new_pack.b14531/_new 2007-05-03 23:46:28.000000000 +0200 @@ -1,31 +1,31 @@ -Index: virt-manager-0.3.0/src/virtManager/console.py +Index: virt-manager-0.4.0/src/virtManager/console.py =================================================================== ---- virt-manager-0.3.0.orig/src/virtManager/console.py -+++ virt-manager-0.3.0/src/virtManager/console.py -@@ -43,6 +43,7 @@ class vmmConsole(gobject.GObject): - self.window = gtk.glade.XML(config.get_glade_file(), "vmm-console", domain="virt-manager") +--- virt-manager-0.4.0.orig/src/virtManager/console.py ++++ virt-manager-0.4.0/src/virtManager/console.py +@@ -47,6 +47,7 @@ class vmmConsole(gobject.GObject): + self.window = gtk.glade.XML(config.get_glade_dir() + "/vmm-console.glade", "vmm-console", domain="virt-manager") self.config = config self.vm = vm + self.grab_notifications = 1 topwin = self.window.get_widget("vmm-console") sens = (self.window.get_widget("menubar2"), -@@ -118,6 +119,10 @@ class vmmConsole(gobject.GObject): +@@ -123,6 +124,10 @@ class vmmConsole(gobject.GObject): def notify_grabbed(self, src): topwin = self.window.get_widget("vmm-console") -+ topwin.set_title(_("Press Ctrl+Alt to release mouse.") + " " + self.title) ++ topwin.set_title(_("Press Ctrl+Alt to release pointer.") + " " + self.title) + if not self.grab_notifications: + return + self.grab_notifications -= 1 try: bus = dbus.SessionBus() noteSvr = bus.get_object("org.freedesktop.Notifications", "/org/freedesktop/Notifications") -@@ -136,7 +141,6 @@ class vmmConsole(gobject.GObject): +@@ -141,7 +146,6 @@ class vmmConsole(gobject.GObject): 5 * 1000); except Exception, e: pass -- topwin.set_title(_("Press Ctrl+Alt to release mouse.") + " " + self.title) +- topwin.set_title(_("Press Ctrl+Alt to release pointer.") + " " + self.title) def notify_ungrabbed(self, src): topwin = self.window.get_widget("vmm-console") ++++++ virtman-type-register.diff ++++++ --- /var/tmp/diff_new_pack.b14531/_old 2007-05-03 23:46:28.000000000 +0200 +++ /var/tmp/diff_new_pack.b14531/_new 2007-05-03 23:46:29.000000000 +0200 @@ -1,62 +1,62 @@ -Index: virt-manager-0.3.0/src/virtManager/connect.py +Index: virt-manager-0.4.0/src/virtManager/connect.py =================================================================== ---- virt-manager-0.3.0.orig/src/virtManager/connect.py -+++ virt-manager-0.3.0/src/virtManager/connect.py -@@ -102,4 +102,3 @@ class vmmConnect(gobject.GObject): +--- virt-manager-0.4.0.orig/src/virtManager/connect.py ++++ virt-manager-0.4.0/src/virtManager/connect.py +@@ -99,4 +99,3 @@ class vmmConnect(gobject.GObject): self.close() self.emit("completed", uri, readOnly) -gobject.type_register(vmmConnect) -Index: virt-manager-0.3.0/src/virtManager/connection.py +Index: virt-manager-0.4.0/src/virtManager/connection.py =================================================================== ---- virt-manager-0.3.0.orig/src/virtManager/connection.py -+++ virt-manager-0.3.0/src/virtManager/connection.py -@@ -242,5 +242,4 @@ class vmmConnection(gobject.GObject): +--- virt-manager-0.4.0.orig/src/virtManager/connection.py ++++ virt-manager-0.4.0/src/virtManager/connection.py +@@ -569,5 +569,4 @@ class vmmConnection(gobject.GObject): uuid.append('-') return "".join(uuid) -gobject.type_register(vmmConnection) -Index: virt-manager-0.3.0/src/virtManager/console.py +Index: virt-manager-0.4.0/src/virtManager/console.py =================================================================== ---- virt-manager-0.3.0.orig/src/virtManager/console.py -+++ virt-manager-0.3.0/src/virtManager/console.py -@@ -454,4 +454,3 @@ class vmmConsole(gobject.GObject): +--- virt-manager-0.4.0.orig/src/virtManager/console.py ++++ virt-manager-0.4.0/src/virtManager/console.py +@@ -486,4 +486,3 @@ class vmmConsole(gobject.GObject): self.ignorePause = False self.ignorePause = False -gobject.type_register(vmmConsole) -Index: virt-manager-0.3.0/src/virtManager/details.py +Index: virt-manager-0.4.0/src/virtManager/details.py =================================================================== ---- virt-manager-0.3.0.orig/src/virtManager/details.py -+++ virt-manager-0.3.0/src/virtManager/details.py -@@ -466,4 +466,3 @@ class vmmDetails(gobject.GObject): - for d in netList: - netsModel.append(None, d) +--- virt-manager-0.4.0.orig/src/virtManager/details.py ++++ virt-manager-0.4.0/src/virtManager/details.py +@@ -581,4 +581,3 @@ class vmmDetails(gobject.GObject): + self.addhw.show() + -gobject.type_register(vmmDetails) -Index: virt-manager-0.3.0/src/virtManager/domain.py +Index: virt-manager-0.4.0/src/virtManager/domain.py =================================================================== ---- virt-manager-0.3.0.orig/src/virtManager/domain.py -+++ virt-manager-0.3.0/src/virtManager/domain.py -@@ -510,4 +510,3 @@ class vmmDomain(gobject.GObject): +--- virt-manager-0.4.0.orig/src/virtManager/domain.py ++++ virt-manager-0.4.0/src/virtManager/domain.py +@@ -569,4 +569,3 @@ class vmmDomain(gobject.GObject): memory = int(memory) self.vm.setMaxMemory(memory) -gobject.type_register(vmmDomain) -Index: virt-manager-0.3.0/src/virtManager/manager.py +Index: virt-manager-0.4.0/src/virtManager/manager.py =================================================================== ---- virt-manager-0.3.0.orig/src/virtManager/manager.py -+++ virt-manager-0.3.0/src/virtManager/manager.py -@@ -597,4 +597,3 @@ class vmmManager(gobject.GObject): - data.reverse() - cell.set_property('data_array', data) +--- virt-manager-0.4.0.orig/src/virtManager/manager.py ++++ virt-manager-0.4.0/src/virtManager/manager.py +@@ -705,4 +705,3 @@ class vmmManager(gobject.GObject): + vm.resume() + -gobject.type_register(vmmManager) -Index: virt-manager-0.3.0/src/vncViewer/vnc.py +Index: virt-manager-0.4.0/src/vncViewer/vnc.py =================================================================== ---- virt-manager-0.3.0.orig/src/vncViewer/vnc.py -+++ virt-manager-0.3.0/src/vncViewer/vnc.py +--- virt-manager-0.4.0.orig/src/vncViewer/vnc.py ++++ virt-manager-0.4.0/src/vncViewer/vnc.py @@ -113,7 +113,6 @@ class GRFBFrameBuffer(rfb.RFBFrameBuffer def move_cursor(self, x, y): logging.error("Unsupported move_cursor operation requested") @@ -65,15 +65,15 @@ class GRFBNetworkClient(rfb.RFBNetworkClient, gobject.GObject): -@@ -166,7 +165,6 @@ class GRFBNetworkClient(rfb.RFBNetworkCl - - def update_pointer(self, mask, x, y): +@@ -177,7 +176,6 @@ class GRFBNetworkClient(rfb.RFBNetworkCl + if y < 0: + y = 0 self.send(pack('>BBHH', 5, mask, x, y)) -gobject.type_register(GRFBNetworkClient) class GRFBViewer(gtk.DrawingArea): -@@ -579,7 +577,6 @@ class GRFBViewer(gtk.DrawingArea): +@@ -598,7 +596,6 @@ class GRFBViewer(gtk.DrawingArea): gc = self.window.new_gc() self.window.draw_drawable(gc, self.fb.get_pixmap(), event.area.x, event.area.y, event.area.x, event.area.y, event.area.width, event.area.height) ++++++ virtman-typo.diff ++++++ Index: virt-manager-0.4.0/src/vncViewer/vnc.py =================================================================== --- virt-manager-0.4.0.orig/src/vncViewer/vnc.py +++ virt-manager-0.4.0/src/vncViewer/vnc.py @@ -305,9 +305,7 @@ class GRFBViewer(gtk.DrawingArea): return self.fb.get_name() def connect_to_host(self, host, port, debug=0): - if self.client != None: - self.disconnect_from_host() - self.client = NOne + self.disconnect_from_host() client = GRFBNetworkClient(host, port, self.fb, debug=debug, preferred_encoding=self.preferred_encoding) client.connect("disconnected", self._client_disconnected) ++++++ virtman-wrong-port.diff ++++++ Index: virt-manager-0.4.0/src/virtManager/domain.py =================================================================== --- virt-manager-0.4.0.orig/src/virtManager/domain.py +++ virt-manager-0.4.0/src/virtManager/domain.py @@ -434,11 +434,8 @@ class vmmDomain(gobject.GObject): port = None if type == "vnc": port = self.get_xml_string("/domain/devices/graphics[@type='vnc']/@port") - if port == None: - port = 5900 + self.get_id() - else: - port = int(port) - return [type, "127.0.0.1", port] + if port is not None: + return [type, "127.0.0.1", int(port)] return [type, None, None] def get_disk_devices(self): ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit subversion
by root＠Hilbert.suse.de 03 May '07

03 May '07

Hello community, here is the log from the commit of package subversion checked in at Thu May 3 23:46:20 CEST 2007. -------- --- subversion/subversion.changes 2007-04-28 14:05:06.000000000 +0200 +++ /mounts/work_src_done/STABLE/subversion/subversion.changes 2007-05-03 18:33:27.000000000 +0200 @@ -1,0 +2,5 @@ +Thu May 3 18:33:23 CEST 2007 - prusnak(a)suse.cz + +- changed expat to libexpat-devel in Requires of devel subpackage + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ subversion.spec ++++++ --- /var/tmp/diff_new_pack.U13321/_old 2007-05-03 23:46:12.000000000 +0200 +++ /var/tmp/diff_new_pack.U13321/_new 2007-05-03 23:46:12.000000000 +0200 @@ -13,7 +13,7 @@ Name: subversion BuildRequires: apache2-devel db-devel gcc-c++ java2-devel-packages neon-devel openldap2-devel python-devel swig Version: 1.4.3 -Release: 14 +Release: 17 # %define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services # @@ -65,7 +65,7 @@ Group: Development/Libraries/C and C++ Summary: Development package for Subversion developers Requires: subversion = %{version} -Requires: neon-devel expat gdbm-devel db-devel zlib-devel openssl-devel libapr-util1-devel libapr1-devel python-devel openldap2-devel +Requires: neon-devel libexpat-devel gdbm-devel db-devel zlib-devel openssl-devel libapr-util1-devel libapr1-devel python-devel openldap2-devel %description devel The subversion-devel package includes the static libraries and include @@ -379,6 +379,8 @@ %{apache_libexecdir}/mod_authz_svn.* %changelog +* Thu May 03 2007 - prusnak(a)suse.cz +- changed expat to libexpat-devel in Requires of devel subpackage * Sat Apr 28 2007 - olh(a)suse.de - move cvs2svn and viewvc to separate specfile * Sat Apr 28 2007 - olh(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rosegarden4
by root＠Hilbert.suse.de 03 May '07

03 May '07

Hello community, here is the log from the commit of package rosegarden4 checked in at Thu May 3 23:46:05 CEST 2007. -------- --- rosegarden4/rosegarden4.changes 2007-05-03 06:40:18.000000000 +0200 +++ /mounts/work_src_done/STABLE/rosegarden4/rosegarden4.changes 2007-05-03 13:44:50.000000000 +0200 @@ -1,0 +2,5 @@ +Thu May 3 13:44:37 CEST 2007 - wstephenson(a)suse.de + +- fix buildrequires libraptor1-devel -> libraptor-devel + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rosegarden4.spec ++++++ --- /var/tmp/diff_new_pack.x12515/_old 2007-05-03 23:45:57.000000000 +0200 +++ /var/tmp/diff_new_pack.x12515/_new 2007-05-03 23:45:57.000000000 +0200 @@ -11,10 +11,10 @@ # norootforbuild Name: rosegarden4 -BuildRequires: cmake dssi fftw3-devel kdelibs3-devel kdemultimedia3-sound ladspa-devel liblo-devel liblrdf-devel libraptor1-devel +BuildRequires: cmake dssi fftw3-devel kdelibs3-devel kdemultimedia3-sound ladspa-devel liblo-devel liblrdf-devel libraptor-devel Summary: MIDI/Audio Sequencer and Notation Editor Version: 1.5.1 -Release: 11 +Release: 13 License: GNU General Public License (GPL) Group: Productivity/Multimedia/Sound/Midi Source: rosegarden-%{version}.tar.bz2 @@ -72,6 +72,8 @@ /opt/kde3/share/mimelnk/audio/* %changelog +* Thu May 03 2007 - wstephenson(a)suse.de +- fix buildrequires libraptor1-devel -> libraptor-devel * Thu May 03 2007 - lrupp(a)suse.de - fix buildrequires raptor-devel -> libraptor1-devel * Tue Apr 17 2007 - tiwai(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit openSUSE-release
by root＠Hilbert.suse.de 03 May '07

03 May '07

Hello community, here is the log from the commit of package openSUSE-release checked in at Thu May 3 23:43:22 CEST 2007. -------- --- openSUSE-release/openSUSE-release.changes 2007-04-12 14:03:50.000000000 +0200 +++ /mounts/work_src_done/STABLE/openSUSE-release/openSUSE-release.changes 2007-05-03 08:40:50.288114000 +0200 @@ -1,0 +2,5 @@ +Thu May 3 08:40:46 CEST 2007 - aj(a)suse.de + +- Alpha4. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openSUSE-release.spec ++++++ --- /var/tmp/diff_new_pack.oY5078/_old 2007-05-03 23:43:15.000000000 +0200 +++ /var/tmp/diff_new_pack.oY5078/_new 2007-05-03 23:43:15.000000000 +0200 @@ -14,7 +14,7 @@ License: GNU General Public License (GPL) Group: System/Fhs Version: 10.3 -Release: 15 +Release: 20 Provides: aaa_version distribution-release Provides: suse-release-oss = %{version}-%{release} Provides: suse-release = %{version}-%{release} @@ -27,7 +27,7 @@ Autoreqprov: on Summary: SuSE release version files BuildRoot: %{_tmppath}/%{name}-%{version}-build -%define betaversion "Alpha3plus" +%define betaversion "Alpha4" %description This package contains the files: /etc/SuSE-release, /etc/issue, and @@ -57,6 +57,8 @@ %config(noreplace) /etc/issue.net %changelog +* Thu May 03 2007 - aj(a)suse.de +- Alpha4. * Thu Apr 12 2007 - aj(a)suse.de - Alpha3plus. * Wed Mar 28 2007 - aj(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yum-metadata-parser
by root＠Hilbert.suse.de 03 May '07

03 May '07

Hello community, here is the log from the commit of package yum-metadata-parser checked in at Thu May 3 23:42:00 CEST 2007. -------- --- yum-metadata-parser/yum-metadata-parser.changes 2007-04-06 11:42:08.000000000 +0200 +++ /mounts/work_src_done/STABLE/yum-metadata-parser/yum-metadata-parser.changes 2007-05-03 13:42:36.542075000 +0200 @@ -1,0 +2,11 @@ +Thu May 3 13:40:23 CEST 2007 - cthiel(a)suse.de + +- update to version 1.1.0 + * setup.py, yum-metadata-parser.spec: bump version to 1.1.0 b/c of the + dbversion change + * db.c, db.h, package.h, xml-parser.c: Bump database version to 10 build_* + and time_* values are stored as ints, rather than text, and + checksum_value has been dropped, as this is the same value as pkgId. + * xml-parser.c: Reduce some code duplication in xml-parser + +------------------------------------------------------------------- Old: ---- yum-metadata-parser-1.0.4.tar.bz2 New: ---- yum-metadata-parser-1.1.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yum-metadata-parser.spec ++++++ --- /var/tmp/diff_new_pack.cz1543/_old 2007-05-03 23:41:39.000000000 +0200 +++ /var/tmp/diff_new_pack.cz1543/_new 2007-05-03 23:41:39.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yum-metadata-parser (Version 1.0.4) +# spec file for package yum-metadata-parser (Version 1.1.0) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -13,7 +13,7 @@ Name: yum-metadata-parser BuildRequires: glib2-devel libxml2-devel pkgconfig python-devel sqlite-devel Summary: A fast metadata parser for yum -Version: 1.0.4 +Version: 1.1.0 Release: 1 Source: %{name}-%{version}.tar.bz2 Patch: %{name}-1.0-quiet.patch @@ -56,6 +56,14 @@ %{py_sitedir}/* %changelog +* Thu May 03 2007 - cthiel(a)suse.de +- update to version 1.1.0 + * setup.py, yum-metadata-parser.spec: bump version to 1.1.0 b/c of the + dbversion change + * db.c, db.h, package.h, xml-parser.c: Bump database version to 10 build_* + and time_* values are stored as ints, rather than text, and + checksum_value has been dropped, as this is the same value as pkgId. + * xml-parser.c: Reduce some code duplication in xml-parser * Fri Apr 06 2007 - cthiel(a)suse.de - update to version 1.0.4 * db.c: Create a pkgKey index for provides, requires, conflicts, and ++++++ yum-metadata-parser-1.0.4.tar.bz2 -> yum-metadata-parser-1.1.0.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yum-metadata-parser-1.0.4/ChangeLog new/yum-metadata-parser-1.1.0/ChangeLog --- old/yum-metadata-parser-1.0.4/ChangeLog 2007-04-04 06:10:02.000000000 +0200 +++ new/yum-metadata-parser-1.1.0/ChangeLog 2007-04-27 15:42:16.000000000 +0200 @@ -1,3 +1,24 @@ +2007-04-27 09:30 skvidal + + * setup.py, yum-metadata-parser.spec: + bump version to 1.1.0 b/c of the dbversion change + +2007-04-10 18:30 jbowes + + * db.c, db.h, package.h, xml-parser.c: Bump database version to 10 + + build_* and time_* values are stored as ints, rather than text, and + checksum_value has been dropped, as this is the same value as + pkgId. + +2007-04-07 19:52 jbowes + + * xml-parser.c: Reduce some code duplication in xml-parser + +2007-04-04 00:07 skvidal + + * ChangeLog: merge changelog + 2007-04-04 00:07 skvidal * setup.py, yum-metadata-parser.spec: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yum-metadata-parser-1.0.4/db.c new/yum-metadata-parser-1.1.0/db.c --- old/yum-metadata-parser-1.0.4/db.c 2007-04-04 06:08:35.000000000 +0200 +++ new/yum-metadata-parser-1.1.0/db.c 2007-04-11 07:20:10.000000000 +0200 @@ -163,7 +163,7 @@ int rc; const char *sql; - sql = "CREATE TABLE db_info (dbversion TEXT, checksum TEXT)"; + sql = "CREATE TABLE db_info (dbversion INTEGER, checksum TEXT)"; rc = sqlite3_exec (db, sql, NULL, NULL, NULL); if (rc != SQLITE_OK) { g_set_error (err, YUM_DB_ERROR, YUM_DB_ERROR, @@ -324,23 +324,22 @@ " summary TEXT," " description TEXT," " url TEXT," - " time_file TEXT," - " time_build TEXT," + " time_file INTEGER," + " time_build INTEGER," " rpm_license TEXT," " rpm_vendor TEXT," " rpm_group TEXT," " rpm_buildhost TEXT," " rpm_sourcerpm TEXT," - " rpm_header_start TEXT," - " rpm_header_end TEXT," + " rpm_header_start INTEGER," + " rpm_header_end INTEGER," " rpm_packager TEXT," - " size_package TEXT," - " size_installed TEXT," - " size_archive TEXT," + " size_package INTEGER," + " size_installed INTEGER," + " size_archive INTEGER," " location_href TEXT," " location_base TEXT," - " checksum_type TEXT," - " checksum_value TEXT)"; + " checksum_type TEXT)"; rc = sqlite3_exec (db, sql, NULL, NULL, NULL); if (rc != SQLITE_OK) { @@ -372,7 +371,7 @@ "CREATE TABLE files (" " name TEXT," " type TEXT," - " pkgKey TEXT)"; + " pkgKey INTEGER)"; rc = sqlite3_exec (db, sql, NULL, NULL, NULL); if (rc != SQLITE_OK) { g_set_error (err, YUM_DB_ERROR, YUM_DB_ERROR, @@ -388,7 +387,7 @@ " epoch TEXT," " version TEXT," " release TEXT," - " pkgKey TEXT %s)"; + " pkgKey INTEGER %s)"; const char *deps[] = { "requires", "provides", "conflicts", "obsoletes", NULL }; int i; @@ -468,9 +467,9 @@ " url, time_file, time_build, rpm_license, rpm_vendor, rpm_group," " rpm_buildhost, rpm_sourcerpm, rpm_header_start, rpm_header_end," " rpm_packager, size_package, size_installed, size_archive," - " location_href, location_base, checksum_type, checksum_value) " + " location_href, location_base, checksum_type) " "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?," - " ?, ?, ?, ?, ?, ?, ?, ?)"; + " ?, ?, ?, ?, ?, ?, ?)"; rc = sqlite3_prepare (db, query, -1, &handle, NULL); if (rc != SQLITE_OK) { @@ -498,23 +497,22 @@ sqlite3_bind_text (handle, 7, p->summary, -1, SQLITE_STATIC); sqlite3_bind_text (handle, 8, p->description, -1, SQLITE_STATIC); sqlite3_bind_text (handle, 9, p->url, -1, SQLITE_STATIC); - sqlite3_bind_text (handle, 10, p->time_file, -1, SQLITE_STATIC); - sqlite3_bind_text (handle, 11, p->time_build, -1, SQLITE_STATIC); + sqlite3_bind_int (handle, 10, p->time_file); + sqlite3_bind_int (handle, 11, p->time_build); sqlite3_bind_text (handle, 12, p->rpm_license, -1, SQLITE_STATIC); sqlite3_bind_text (handle, 13, p->rpm_vendor, -1, SQLITE_STATIC); sqlite3_bind_text (handle, 14, p->rpm_group, -1, SQLITE_STATIC); sqlite3_bind_text (handle, 15, p->rpm_buildhost, -1, SQLITE_STATIC); sqlite3_bind_text (handle, 16, p->rpm_sourcerpm, -1, SQLITE_STATIC); - sqlite3_bind_text (handle, 17, p->rpm_header_start, -1, SQLITE_STATIC); - sqlite3_bind_text (handle, 18, p->rpm_header_end, -1, SQLITE_STATIC); + sqlite3_bind_int (handle, 17, p->rpm_header_start); + sqlite3_bind_int (handle, 18, p->rpm_header_end); sqlite3_bind_text (handle, 19, p->rpm_packager, -1, SQLITE_STATIC); - sqlite3_bind_text (handle, 20, p->size_package, -1, SQLITE_STATIC); - sqlite3_bind_text (handle, 21, p->size_installed, -1, SQLITE_STATIC); - sqlite3_bind_text (handle, 22, p->size_archive, -1, SQLITE_STATIC); + sqlite3_bind_int (handle, 20, p->size_package); + sqlite3_bind_int (handle, 21, p->size_installed); + sqlite3_bind_int (handle, 22, p->size_archive); sqlite3_bind_text (handle, 23, p->location_href, -1, SQLITE_STATIC); sqlite3_bind_text (handle, 24, p->location_base, -1, SQLITE_STATIC); sqlite3_bind_text (handle, 25, p->checksum_type, -1, SQLITE_STATIC); - sqlite3_bind_text (handle, 26, p->checksum_value, -1, SQLITE_STATIC); rc = sqlite3_step (handle); sqlite3_reset (handle); @@ -822,7 +820,7 @@ "CREATE TABLE changelog (" " pkgKey INTEGER," " author TEXT," - " date TEXT," + " date INTEGER," " changelog TEXT)"; rc = sqlite3_exec (db, sql, NULL, NULL, NULL); if (rc != SQLITE_OK) { @@ -900,7 +898,7 @@ sqlite3_bind_int (handle, 1, p->pkgKey); sqlite3_bind_text (handle, 2, entry->author, -1, SQLITE_STATIC); - sqlite3_bind_text (handle, 3, entry->date, -1, SQLITE_STATIC); + sqlite3_bind_int (handle, 3, entry->date); sqlite3_bind_text (handle, 4, entry->changelog, -1, SQLITE_STATIC); rc = sqlite3_step (handle); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yum-metadata-parser-1.0.4/db.h new/yum-metadata-parser-1.1.0/db.h --- old/yum-metadata-parser-1.0.4/db.h 2007-03-13 15:43:57.000000000 +0100 +++ new/yum-metadata-parser-1.1.0/db.h 2007-04-11 07:20:10.000000000 +0200 @@ -22,7 +22,7 @@ #include <sqlite3.h> #include "package.h" -#define YUM_SQLITE_CACHE_DBVERSION 9 +#define YUM_SQLITE_CACHE_DBVERSION 10 #define YUM_DB_ERROR yum_db_error_quark() GQuark yum_db_error_quark (void); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yum-metadata-parser-1.0.4/package.h new/yum-metadata-parser-1.1.0/package.h --- old/yum-metadata-parser-1.0.4/package.h 2007-03-13 15:43:57.000000000 +0100 +++ new/yum-metadata-parser-1.1.0/package.h 2007-04-11 07:20:10.000000000 +0200 @@ -36,7 +36,7 @@ typedef struct { char *author; - char *date; + gint64 date; char *changelog; } ChangelogEntry; @@ -51,23 +51,22 @@ char *summary; char *description; char *url; - char *time_file; - char *time_build; + gint64 time_file; + gint64 time_build; char *rpm_license; char *rpm_vendor; char *rpm_group; char *rpm_buildhost; char *rpm_sourcerpm; - char *rpm_header_start; - char *rpm_header_end; + gint64 rpm_header_start; + gint64 rpm_header_end; char *rpm_packager; - char *size_package; - char *size_installed; - char *size_archive; + gint64 size_package; + gint64 size_installed; + gint64 size_archive; char *location_href; char *location_base; char *checksum_type; - char *checksum_value; GSList *requires; GSList *provides; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yum-metadata-parser-1.0.4/PKG-INFO new/yum-metadata-parser-1.1.0/PKG-INFO --- old/yum-metadata-parser-1.0.4/PKG-INFO 2007-04-04 06:12:53.000000000 +0200 +++ new/yum-metadata-parser-1.1.0/PKG-INFO 2007-04-27 15:42:42.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: yum-metadata-parser -Version: 1.0.4 +Version: 1.1.0 Summary: A fast YUM meta-data parser Home-page: UNKNOWN Author: UNKNOWN diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yum-metadata-parser-1.0.4/setup.py new/yum-metadata-parser-1.1.0/setup.py --- old/yum-metadata-parser-1.0.4/setup.py 2007-04-04 06:08:51.000000000 +0200 +++ new/yum-metadata-parser-1.1.0/setup.py 2007-04-27 15:31:36.000000000 +0200 @@ -23,7 +23,7 @@ 'sqlitecache.c']) setup (name = 'yum-metadata-parser', - version = '1.0.4', + version = '1.1.0', description = 'A fast YUM meta-data parser', py_modules = ['sqlitecachec'], ext_modules = [module]) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yum-metadata-parser-1.0.4/xml-parser.c new/yum-metadata-parser-1.1.0/xml-parser.c --- old/yum-metadata-parser-1.0.4/xml-parser.c 2007-03-13 15:43:57.000000000 +0100 +++ new/yum-metadata-parser-1.1.0/xml-parser.c 2007-04-11 07:20:10.000000000 +0200 @@ -105,6 +105,26 @@ } static void +parse_version_info(const char **attrs, Package *p) +{ + int i; + const char *attr; + const char *value; + + for (i = 0; attrs && attrs[i]; i++) { + attr = attrs[i]; + value = attrs[++i]; + + if (!strcmp (attr, "epoch")) + p->epoch = g_string_chunk_insert (p->chunk, value); + else if (!strcmp (attr, "ver")) + p->version = g_string_chunk_insert (p->chunk, value); + else if (!strcmp (attr, "rel")) + p->release = g_string_chunk_insert (p->chunk, value); + } +} + +static void primary_parser_package_start (PrimarySAXContext *ctx, const char *name, const char **attrs) @@ -123,17 +143,7 @@ } else if (!strcmp (name, "version")) { - for (i = 0; attrs && attrs[i]; i++) { - attr = attrs[i]; - value = attrs[++i]; - - if (!strcmp (attr, "epoch")) - p->epoch = g_string_chunk_insert (p->chunk, value); - else if (!strcmp (attr, "ver")) - p->version = g_string_chunk_insert (p->chunk, value); - else if (!strcmp (attr, "rel")) - p->release = g_string_chunk_insert (p->chunk, value); - } + parse_version_info(attrs, p); } else if (!strcmp (name, "checksum")) { @@ -152,9 +162,9 @@ value = attrs[++i]; if (!strcmp (attr, "file")) - p->time_file = g_string_chunk_insert (p->chunk, value); + p->time_file = strtol(value, NULL, 10); else if (!strcmp (attr, "build")) - p->time_build = g_string_chunk_insert (p->chunk, value); + p->time_build = strtol(value, NULL, 10); } } @@ -164,11 +174,11 @@ value = attrs[++i]; if (!strcmp (attr, "package")) - p->size_package = g_string_chunk_insert (p->chunk, value); + p->size_package = strtol(value, NULL, 10); else if (!strcmp (attr, "installed")) - p->size_installed = g_string_chunk_insert (p->chunk, value); + p->size_installed = strtol(value, NULL, 10); else if (!strcmp (attr, "archive")) - p->size_archive = g_string_chunk_insert (p->chunk, value); + p->size_archive = strtol(value, NULL, 10); } } @@ -203,9 +213,9 @@ value = attrs[++i]; if (!strcmp (attr, "start")) - p->rpm_header_start = g_string_chunk_insert (p->chunk, value); + p->rpm_header_start = strtol(value, NULL, 10); else if (!strcmp (attr, "end")) - p->rpm_header_end = g_string_chunk_insert (p->chunk, value); + p->rpm_header_end = strtol(value, NULL, 10); } } @@ -356,10 +366,9 @@ ctx->text_buffer->str, ctx->text_buffer->len); else if (!strcmp (name, "checksum")) - p->checksum_value = p->pkgId = - g_string_chunk_insert_len (p->chunk, - ctx->text_buffer->str, - ctx->text_buffer->len); + p->pkgId = g_string_chunk_insert_len (p->chunk, + ctx->text_buffer->str, + ctx->text_buffer->len); else if (!strcmp (name, "summary")) p->summary = g_string_chunk_insert_len (p->chunk, ctx->text_buffer->str, @@ -556,6 +565,26 @@ /*****************************************************************************/ +static void +parse_package (const char **attrs, Package *p) +{ + int i; + const char *attr; + const char *value; + + for (i = 0; attrs && attrs[i]; i++) { + attr = attrs[i]; + value = attrs[++i]; + + if (!strcmp (attr, "pkgid")) + p->pkgId = g_string_chunk_insert (p->chunk, value); + if (!strcmp (attr, "name")) + p->name = g_string_chunk_insert (p->chunk, value); + else if (!strcmp (attr, "arch")) + p->arch = g_string_chunk_insert (p->chunk, value); + } +} + typedef enum { FILELIST_PARSER_TOPLEVEL = 0, FILELIST_PARSER_PACKAGE, @@ -582,28 +611,12 @@ const char **attrs) { if (!strcmp (name, "package")) { - Package *p; - int i; - const char *attr; - const char *value; - g_assert (ctx->current_package == NULL); ctx->state = FILELIST_PARSER_PACKAGE; - ctx->current_package = p = package_new (); - - for (i = 0; attrs && attrs[i]; i++) { - attr = attrs[i]; - value = attrs[++i]; - - if (!strcmp (attr, "pkgid")) - p->pkgId = g_string_chunk_insert (p->chunk, value); - if (!strcmp (attr, "name")) - p->name = g_string_chunk_insert (p->chunk, value); - else if (!strcmp (attr, "arch")) - p->arch = g_string_chunk_insert (p->chunk, value); - } + ctx->current_package = package_new (); + parse_package (attrs, ctx->current_package); } else if (ctx->count_fn && !strcmp (name, "filelists")) { @@ -639,17 +652,7 @@ ctx->want_text = TRUE; if (!strcmp (name, "version")) { - for (i = 0; attrs && attrs[i]; i++) { - attr = attrs[i]; - value = attrs[++i]; - - if (!strcmp (attr, "epoch")) - p->epoch = g_string_chunk_insert (p->chunk, value); - else if (!strcmp (attr, "ver")) - p->version = g_string_chunk_insert (p->chunk, value); - else if (!strcmp (attr, "rel")) - p->release = g_string_chunk_insert (p->chunk, value); - } + parse_version_info(attrs, p); } else if (!strcmp (name, "file")) { @@ -869,28 +872,12 @@ const char **attrs) { if (!strcmp (name, "package")) { - Package *p; - int i; - const char *attr; - const char *value; - g_assert (ctx->current_package == NULL); ctx->state = OTHER_PARSER_PACKAGE; - ctx->current_package = p = package_new (); - - for (i = 0; attrs && attrs[i]; i++) { - attr = attrs[i]; - value = attrs[++i]; - - if (!strcmp (attr, "pkgid")) - p->pkgId = g_string_chunk_insert (p->chunk, value); - if (!strcmp (attr, "name")) - p->name = g_string_chunk_insert (p->chunk, value); - else if (!strcmp (attr, "arch")) - p->arch = g_string_chunk_insert (p->chunk, value); - } + ctx->current_package = package_new (); + parse_package (attrs, ctx->current_package); } else if (ctx->count_fn && !strcmp (name, "otherdata")) { @@ -926,17 +913,7 @@ ctx->want_text = TRUE; if (!strcmp (name, "version")) { - for (i = 0; attrs && attrs[i]; i++) { - attr = attrs[i]; - value = attrs[++i]; - - if (!strcmp (attr, "epoch")) - p->epoch = g_string_chunk_insert (p->chunk, value); - else if (!strcmp (attr, "ver")) - p->version = g_string_chunk_insert (p->chunk, value); - else if (!strcmp (attr, "rel")) - p->release = g_string_chunk_insert (p->chunk, value); - } + parse_version_info(attrs, p); } else if (!strcmp (name, "changelog")) { @@ -950,8 +927,7 @@ ctx->current_entry->author = g_string_chunk_insert_const (p->chunk, value); else if (!strcmp (attr, "date")) - ctx->current_entry->date = - g_string_chunk_insert_const (p->chunk, value); + ctx->current_entry->date = strtol(value, NULL, 10); } } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yum-metadata-parser-1.0.4/yum-metadata-parser.spec new/yum-metadata-parser-1.1.0/yum-metadata-parser.spec --- old/yum-metadata-parser-1.0.4/yum-metadata-parser.spec 2007-04-04 06:09:31.000000000 +0200 +++ new/yum-metadata-parser-1.1.0/yum-metadata-parser.spec 2007-04-27 15:31:22.000000000 +0200 @@ -2,7 +2,7 @@ Summary: A fast metadata parser for yum Name: yum-metadata-parser -Version: 1.0.4 +Version: 1.1.0 Release: 1%{?dist} Source0: %{name}-%{version}.tar.gz License: GPL @@ -40,6 +40,9 @@ %{python_sitelib_platform}/sqlitecachec.pyo %changelog +* Fri Apr 27 2007 Seth Vidal <skvidal at linux.duke.edu> +- split out 1.1.0 for dbversion 10 + * Wed Apr 4 2007 Seth Vidal <skvidal at linux.duke.edu> - 1.0.4 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yum
by root＠Hilbert.suse.de 03 May '07

03 May '07

Hello community, here is the log from the commit of package yum checked in at Thu May 3 23:41:32 CEST 2007. -------- --- yum/yum.changes 2007-04-10 15:04:23.000000000 +0200 +++ /mounts/work_src_done/STABLE/yum/yum.changes 2007-05-03 13:50:27.059941000 +0200 @@ -1,0 +2,17 @@ +Thu May 3 13:48:24 CEST 2007 - cthiel(a)suse.de + +- added yum-3.1.7.patch to workaround bug #255914 + +------------------------------------------------------------------- +Thu May 3 13:38:24 CEST 2007 - cthiel(a)suse.de + +- update to version 3.1.7 + * We raised the minor version on yum-metadata-parser b/c we've increased + the db version of the yum sqlite dbs to 10. yum 3.1.7 now has an + explicit require on yum-metadata-parser 1.1.0 + * There have been a lot of changes since yum 3.1.6. The depsolver has + changed around, we've merged optimizations from all sorts of folks and + added in a couple of new features. As well we have hopefully fixed a + number of bugs. :) + +------------------------------------------------------------------- Old: ---- yum-3.1.6.tar.bz2 New: ---- yum-3.1.7.patch yum-3.1.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yum.spec ++++++ --- /var/tmp/diff_new_pack.E10992/_old 2007-05-03 23:38:26.000000000 +0200 +++ /var/tmp/diff_new_pack.E10992/_new 2007-05-03 23:38:26.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yum (Version 3.1.6) +# spec file for package yum (Version 3.1.7) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,8 +12,8 @@ Name: yum BuildRequires: python-devel -Version: 3.1.6 -Release: 3 +Version: 3.1.7 +Release: 1 Summary: RPM installer/updater Group: System/Packages License: GNU General Public License (GPL) @@ -23,11 +23,12 @@ Source2: repos.tar.bz2 Patch: %{name}-no_updatesd.patch Patch1: %{name}-install.patch +Patch2: %{name}-3.1.7.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: rpm >= 4.4.0 Requires: rpm-python Requires: python-urlgrabber -Requires: yum-metadata-parser +Requires: yum-metadata-parser >= 1.1.0 %if %{suse_version} <= 1010 Requires: python-elementtree %else @@ -51,6 +52,7 @@ %setup -q -b 2 %patch %patch1 +%patch2 %ifnarch %{ix86} for i in rpmUtils yum do @@ -97,6 +99,17 @@ %{py_sitedir}/* %changelog +* Thu May 03 2007 - cthiel(a)suse.de +- added yum-3.1.7.patch to workaround bug #255914 +* Thu May 03 2007 - cthiel(a)suse.de +- update to version 3.1.7 + * We raised the minor version on yum-metadata-parser b/c we've increased + the db version of the yum sqlite dbs to 10. yum 3.1.7 now has an + explicit require on yum-metadata-parser 1.1.0 + * There have been a lot of changes since yum 3.1.6. The depsolver has + changed around, we've merged optimizations from all sorts of folks and + added in a couple of new features. As well we have hopefully fixed a + number of bugs. :) * Tue Apr 10 2007 - cthiel(a)suse.de - added yum-install.patch by Jan Matejek which replaces $(PYDIR) with correct value, $(PKGDIR) ++++++ yum-3.1.7.patch ++++++ --- yum/rpmsack.py +++ yum/rpmsack.py @@ -104,7 +104,7 @@ ts = self.readOnlyTS() result = {} - mi = ts.dbMatch('basenames', name) + mi = ts.dbMatch('basenames', name.encode('us-ascii')) for hdr in mi: pkg = self._makePackageObject(hdr, mi.instance()) if not result.has_key(pkg.pkgid): @@ -119,7 +119,7 @@ ts = self.readOnlyTS() result = {} tag = self.DEP_TABLE[prcotype][0] - mi = ts.dbMatch(tag, name) + mi = ts.dbMatch(tag, name.encode('us-ascii')) for hdr in mi: po = self._makePackageObject(hdr, mi.instance()) prcotup = (name, None, (None, None, None)) ++++++ yum-3.1.6.tar.bz2 -> yum-3.1.7.tar.bz2 ++++++ ++++ 5824 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-update
by root＠Hilbert.suse.de 03 May '07

03 May '07

Hello community, here is the log from the commit of package yast2-update checked in at Thu May 3 23:38:08 CEST 2007. -------- --- yast2-update/yast2-update.changes 2007-04-17 13:29:18.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-update/yast2-update.changes 2007-05-03 16:42:33.054538000 +0200 @@ -1,0 +2,17 @@ +Thu May 3 15:51:10 CEST 2007 - lslezak(a)suse.cz + +- Don't display excessive progress popup (#269920) +- 2.15.11 + +------------------------------------------------------------------- +Wed May 2 10:13:52 CEST 2007 - locilka(a)suse.cz + +- CommandLine interface support for update script (#269910) + +------------------------------------------------------------------- +Wed Apr 18 14:53:14 CEST 2007 - locilka(a)suse.cz + +- Fixed System Update script (udate.ycp) to use + Wizard::OpenNextBackStepsDialog instead of OpenNextBackDialog. + +------------------------------------------------------------------- @@ -6 +23 @@ -- 2.13.10 +- 2.15.10 Old: ---- yast2-update-2.15.10.tar.bz2 New: ---- yast2-update-2.15.11.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-update.spec ++++++ --- /var/tmp/diff_new_pack.FQ6148/_old 2007-05-03 23:34:49.000000000 +0200 +++ /var/tmp/diff_new_pack.FQ6148/_new 2007-05-03 23:34:49.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-update (Version 2.15.10) +# spec file for package yast2-update (Version 2.15.11) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-update -Version: 2.15.10 +Version: 2.15.11 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-update-2.15.10.tar.bz2 +Source0: yast2-update-2.15.11.tar.bz2 prefix: /usr BuildRequires: perl-XML-Writer yast2 yast2-add-on yast2-devtools yast2-packager yast2-testsuite Requires: yast2 @@ -51,7 +51,7 @@ Jiri Srain <jsrain(a)suse.cz> %prep -%setup -n yast2-update-2.15.10 +%setup -n yast2-update-2.15.11 %build %{prefix}/bin/y2tool y2autoconf @@ -86,10 +86,18 @@ %doc %{prefix}/share/doc/packages/yast2-update %changelog +* Thu May 03 2007 - lslezak(a)suse.cz +- Don't display excessive progress popup (#269920) +- 2.15.11 +* Wed May 02 2007 - locilka(a)suse.cz +- CommandLine interface support for update script (#269910) +* Wed Apr 18 2007 - locilka(a)suse.cz +- Fixed System Update script (udate.ycp) to use + Wizard::OpenNextBackStepsDialog instead of OpenNextBackDialog. * Tue Apr 17 2007 - locilka(a)suse.cz - Removed System Update icon from YaST Control Center (#265225). - Removed update-desktop-files from BuildRequires -- 2.13.10 +- 2.15.10 * Wed Apr 11 2007 - locilka(a)suse.cz - Added icon into Update Options dialog. - Added help for Update Options summary proposal (#227265). ++++++ yast2-update-2.15.10.tar.bz2 -> yast2-update-2.15.11.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.15.10/configure new/yast2-update-2.15.11/configure --- old/yast2-update-2.15.10/configure 2007-04-17 13:12:19.000000000 +0200 +++ new/yast2-update-2.15.11/configure 2007-05-03 16:37:46.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.60 for yast2-update 2.15.10. +# Generated by GNU Autoconf 2.60 for yast2-update 2.15.11. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -559,8 +559,8 @@ # Identity of this package. PACKAGE_NAME='yast2-update' PACKAGE_TARNAME='yast2-update' -PACKAGE_VERSION='2.15.10' -PACKAGE_STRING='yast2-update 2.15.10' +PACKAGE_VERSION='2.15.11' +PACKAGE_STRING='yast2-update 2.15.11' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1181,7 +1181,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-update 2.15.10 to adapt to many kinds of systems. +\`configure' configures yast2-update 2.15.11 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1252,7 +1252,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-update 2.15.10:";; + short | recursive ) echo "Configuration of yast2-update 2.15.11:";; esac cat <<\_ACEOF @@ -1330,7 +1330,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-update configure 2.15.10 +yast2-update configure 2.15.11 generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1344,7 +1344,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-update $as_me 2.15.10, which was +It was created by yast2-update $as_me 2.15.11, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -2145,7 +2145,7 @@ # Define the identity of the package. PACKAGE='yast2-update' - VERSION='2.15.10' + VERSION='2.15.11' cat >>confdefs.h <<_ACEOF @@ -2372,7 +2372,7 @@ -VERSION="2.15.10" +VERSION="2.15.11" RPMNAME="yast2-update" MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" @@ -3260,7 +3260,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-update $as_me 2.15.10, which was +This file was extended by yast2-update $as_me 2.15.11, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3303,7 +3303,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-update config.status 2.15.10 +yast2-update config.status 2.15.11 configured by $0, generated by GNU Autoconf 2.60, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.15.10/configure.in new/yast2-update-2.15.11/configure.in --- old/yast2-update-2.15.10/configure.in 2007-04-17 13:12:15.000000000 +0200 +++ new/yast2-update-2.15.11/configure.in 2007-05-03 16:37:39.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-update, 2.15.10, http://bugs.opensuse.org/, yast2-update) +AC_INIT(yast2-update, 2.15.11, http://bugs.opensuse.org/, yast2-update) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.15.10" +VERSION="2.15.11" RPMNAME="yast2-update" MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.15.10/kernel-update-tool.pot new/yast2-update-2.15.11/kernel-update-tool.pot --- old/yast2-update-2.15.10/kernel-update-tool.pot 2007-04-05 11:00:58.000000000 +0200 +++ new/yast2-update-2.15.11/kernel-update-tool.pot 1970-01-01 01:00:00.000000000 +0100 @@ -1,33 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-04-05 11:00+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL(a)li.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: src/clients/kernel-update.ycp:189 -msgid "Warning" -msgstr "" - -#: src/clients/kernel-update.ycp:190 -msgid "Abort the kernel upgrade?" -msgstr "" - -#: src/clients/kernel-update.ycp:247 -msgid "Alternate Download Location" -msgstr "" - -#: src/clients/kernel-update.ycp:510 -msgid "Kernel Update Status Log" -msgstr "" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.15.10/src/clients/update_proposal.ycp new/yast2-update-2.15.11/src/clients/update_proposal.ycp --- old/yast2-update-2.15.10/src/clients/update_proposal.ycp 2007-04-11 18:23:41.000000000 +0200 +++ new/yast2-update-2.15.11/src/clients/update_proposal.ycp 2007-05-03 16:02:14.000000000 +0200 @@ -5,7 +5,7 @@ * * Purpose: Let user choose update settings. * - * $Id: update_proposal.ycp 37403 2007-04-11 16:23:39Z locilka $ + * $Id: update_proposal.ycp 37811 2007-05-03 14:02:12Z lslezak $ */ { textdomain "update"; @@ -173,16 +173,7 @@ define void init_stuff () { // initialize package manager - if (true) - { - UI::OpenDialog (`opt(`decorated), - // intermediate popup while initializing internal packagemanagement - `Label(_("Reading package information. One moment please..."))); - - Packages::Init (true); - - UI::CloseDialog(); - } + Packages::Init(true); // initialize target if (true) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.15.10/src/clients/update.ycp new/yast2-update-2.15.11/src/clients/update.ycp --- old/yast2-update-2.15.10/src/clients/update.ycp 2007-02-15 11:42:48.000000000 +0100 +++ new/yast2-update-2.15.11/src/clients/update.ycp 2007-05-03 15:05:30.000000000 +0200 @@ -4,24 +4,38 @@ * Summary: Main update client * Authors: Klaus Kaempf <kkaempf(a)suse.de> * Arvin Schnell <arvin(a)suse.de> + * Lukas Ocilka <locilka(a)suse.cz> * - * $Id: update.ycp 34202 2006-11-09 12:31:44Z locilka $ + * $Id: update.ycp 37767 2007-05-02 08:16:04Z locilka $ */ { textdomain "update"; - // somewhere, DirInstall is imported that wants Pkg in the constructor - import "PackageLock"; - // check whether having the packager for ourselves - if (! PackageLock::Check ()) - return `abort; - import "Mode"; import "Update"; import "Wizard"; import "ProductControl"; import "Label"; + import "Mode"; + import "GetInstArgs"; + import "CommandLine"; + + // Bugzilla #269910, CommanLine "support" + // argmap is only a map, CommandLine uses string parameters + if (size (GetInstArgs::argmap()) == 0 && size (WFM::Args()) > 0) { + Mode::SetUI ("commandline"); + y2milestone ("Mode CommandLine not supported, exiting..."); + // TRANSLATORS: error message - the module does not provide command line interface + CommandLine::Print(_("There is no user interface available for this module.")); + return `auto; + } + + // somewhere, DirInstall is imported that wants Pkg in the constructor + import "PackageLock"; + // check whether having the packager for ourselves + if (! PackageLock::Check ()) + return `abort; // set normal mode and update Mode::SetMode ("update"); @@ -32,7 +46,7 @@ ProductControl::custom_control_file = "/usr/share/YaST2/control/update.xml"; - Wizard::OpenNextBackDialog(); + Wizard::OpenNextBackStepsDialog(); Wizard::SetNextButton(`next, Label::AcceptButton()); if (!ProductControl::Init()) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.15.10/VERSION new/yast2-update-2.15.11/VERSION --- old/yast2-update-2.15.10/VERSION 2007-04-17 13:05:04.000000000 +0200 +++ new/yast2-update-2.15.11/VERSION 2007-05-03 15:50:53.000000000 +0200 @@ -1 +1 @@ -2.15.10 +2.15.11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0