Hello community, here is the log from the commit of package vm-install for openSUSE:Factory checked in at 2012-02-16 15:03:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vm-install (Old) and /work/SRC/openSUSE:Factory/.vm-install.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "vm-install", Maintainer is "CARNOLD@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/vm-install/vm-install.changes 2012-02-14 13:11:52.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.vm-install.new/vm-install.changes 2012-02-16 15:03:21.000000000 +0100 @@ -1,0 +2,11 @@ +Wed Feb 15 17:06:41 MST 2012 - carnold@novell.com + +- bnc#742773 - vm-install shows bogus error msg without defined + installation source + +------------------------------------------------------------------- +Mon Jan 30 13:09:57 MST 2012 - carnold@novell.com + +- bnc#743951 - vm-install windows too big + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vm-install.spec ++++++ --- /var/tmp/diff_new_pack.rup6fQ/_old 2012-02-16 15:03:23.000000000 +0100 +++ /var/tmp/diff_new_pack.rup6fQ/_new 2012-02-16 15:03:23.000000000 +0100 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: vm-install Url: http://developer.novell.com/wiki/index.php/Vm-install BuildRequires: python-devel ++++++ vm-install-0.5.7.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.5.7/glade/vm-install.glade new/vm-install-0.5.7/glade/vm-install.glade --- old/vm-install-0.5.7/glade/vm-install.glade 2011-07-16 00:06:25.000000000 +0200 +++ new/vm-install-0.5.7/glade/vm-install.glade 2012-01-30 21:10:57.000000000 +0100 @@ -4414,7 +4414,7 @@ <property name="label" translatable="yes">fv_install_help</property> <property name="use_underline">False</property> <property name="use_markup">True</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="justify">GTK_JUSTIFY_FILL</property> <property name="wrap">True</property> <property name="selectable">False</property> <property name="xalign">0</property> @@ -4429,7 +4429,7 @@ <packing> <property name="padding">0</property> <property name="expand">False</property> - <property name="fill">False</property> + <property name="fill">True</property> </packing> </child> @@ -4648,7 +4648,7 @@ <property name="label" translatable="yes">fv_os_settings_help</property> <property name="use_underline">False</property> <property name="use_markup">True</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="justify">GTK_JUSTIFY_FILL</property> <property name="wrap">True</property> <property name="selectable">False</property> <property name="xalign">0</property> @@ -4663,7 +4663,7 @@ <packing> <property name="padding">0</property> <property name="expand">False</property> - <property name="fill">False</property> + <property name="fill">True</property> </packing> </child> @@ -4786,7 +4786,7 @@ <property name="label" translatable="yes">fv_i_extra_args_help</property> <property name="use_underline">False</property> <property name="use_markup">True</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="justify">GTK_JUSTIFY_FILL</property> <property name="wrap">True</property> <property name="selectable">False</property> <property name="xalign">0</property> @@ -4801,7 +4801,7 @@ <packing> <property name="padding">0</property> <property name="expand">False</property> - <property name="fill">False</property> + <property name="fill">True</property> </packing> </child> @@ -4916,7 +4916,7 @@ <property name="label" translatable="yes">fv_exit_args_help</property> <property name="use_underline">False</property> <property name="use_markup">True</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="justify">GTK_JUSTIFY_FILL</property> <property name="wrap">True</property> <property name="selectable">False</property> <property name="xalign">0</property> @@ -4931,15 +4931,15 @@ <packing> <property name="padding">0</property> <property name="expand">False</property> - <property name="fill">False</property> + <property name="fill">True</property> </packing> </child> <child> <widget class="GtkTable" id="table132"> <property name="visible">True</property> - <property name="n_rows">3</property> - <property name="n_columns">2</property> + <property name="n_rows">1</property> + <property name="n_columns">6</property> <property name="homogeneous">False</property> <property name="row_spacing">2</property> <property name="column_spacing">10</property> @@ -4950,7 +4950,7 @@ <property name="label" translatable="yes">fv_on_poweroff_label</property> <property name="use_underline">False</property> <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="justify">GTK_JUSTIFY_FILL</property> <property name="wrap">False</property> <property name="selectable">False</property> <property name="xalign">1</property> @@ -4973,37 +4973,25 @@ </child> <child> - <widget class="GtkLabel" id="fv_on_reboot_label"> + <widget class="GtkComboBox" id="fv-poweroff-combo"> <property name="visible">True</property> - <property name="label" translatable="yes">fv_on_reboot_label</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">1</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> + <property name="items" translatable="yes"></property> + <property name="add_tearoffs">False</property> + <property name="focus_on_click">True</property> </widget> <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">fill</property> - <property name="y_options"></property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">0</property> + <property name="bottom_attach">1</property> + <property name="y_options">fill</property> </packing> </child> <child> - <widget class="GtkLabel" id="fv_on_crash_label"> + <widget class="GtkLabel" id="fv_on_reboot_label"> <property name="visible">True</property> - <property name="label" translatable="yes">fv_on_crash_label</property> + <property name="label" translatable="yes">fv_on_reboot_label</property> <property name="use_underline">False</property> <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_LEFT</property> @@ -5019,25 +5007,24 @@ <property name="angle">0</property> </widget> <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> + <property name="left_attach">2</property> + <property name="right_attach">3</property> + <property name="top_attach">0</property> + <property name="bottom_attach">1</property> <property name="x_options">fill</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkComboBox" id="fv-poweroff-combo"> + <widget class="GtkComboBox" id="fv-reboot-combo"> <property name="visible">True</property> - <property name="items" translatable="yes"></property> <property name="add_tearoffs">False</property> <property name="focus_on_click">True</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> + <property name="left_attach">3</property> + <property name="right_attach">4</property> <property name="top_attach">0</property> <property name="bottom_attach">1</property> <property name="y_options">fill</property> @@ -5045,35 +5032,44 @@ </child> <child> - <widget class="GtkComboBox" id="fv-reboot-combo"> + <widget class="GtkLabel" id="fv_on_crash_label"> <property name="visible">True</property> - <property name="items" translatable="yes"></property> - <property name="add_tearoffs">False</property> - <property name="focus_on_click">True</property> + <property name="label" translatable="yes">fv_on_crash_label</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">1</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> + <property name="left_attach">4</property> + <property name="right_attach">5</property> + <property name="top_attach">0</property> + <property name="bottom_attach">1</property> <property name="x_options">fill</property> - <property name="y_options">fill</property> + <property name="y_options"></property> </packing> </child> <child> <widget class="GtkComboBox" id="fv-crash-combo"> <property name="visible">True</property> - <property name="items" translatable="yes"></property> <property name="add_tearoffs">False</property> <property name="focus_on_click">True</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">fill</property> + <property name="left_attach">5</property> + <property name="right_attach">6</property> + <property name="top_attach">0</property> + <property name="bottom_attach">1</property> <property name="y_options">fill</property> </packing> </child> @@ -5201,7 +5197,7 @@ <property name="label" translatable="yes">pv_install_help</property> <property name="use_underline">False</property> <property name="use_markup">True</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="justify">GTK_JUSTIFY_FILL</property> <property name="wrap">True</property> <property name="selectable">False</property> <property name="xalign">0</property> @@ -5216,7 +5212,7 @@ <packing> <property name="padding">0</property> <property name="expand">False</property> - <property name="fill">False</property> + <property name="fill">True</property> </packing> </child> @@ -5434,7 +5430,7 @@ <property name="label" translatable="yes">os_settings_help</property> <property name="use_underline">False</property> <property name="use_markup">True</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="justify">GTK_JUSTIFY_FILL</property> <property name="wrap">True</property> <property name="selectable">False</property> <property name="xalign">0</property> @@ -5449,7 +5445,7 @@ <packing> <property name="padding">0</property> <property name="expand">False</property> - <property name="fill">False</property> + <property name="fill">True</property> </packing> </child> @@ -5572,7 +5568,7 @@ <property name="label" translatable="yes">i_extra_args_help</property> <property name="use_underline">False</property> <property name="use_markup">True</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="justify">GTK_JUSTIFY_FILL</property> <property name="wrap">True</property> <property name="selectable">False</property> <property name="xalign">0</property> @@ -5587,7 +5583,7 @@ <packing> <property name="padding">0</property> <property name="expand">False</property> - <property name="fill">False</property> + <property name="fill">True</property> </packing> </child> @@ -5693,7 +5689,7 @@ <property name="label" translatable="yes">pv_exit_args_help</property> <property name="use_underline">False</property> <property name="use_markup">True</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="justify">GTK_JUSTIFY_FILL</property> <property name="wrap">True</property> <property name="selectable">False</property> <property name="xalign">0</property> @@ -5708,15 +5704,15 @@ <packing> <property name="padding">0</property> <property name="expand">False</property> - <property name="fill">False</property> + <property name="fill">True</property> </packing> </child> <child> <widget class="GtkTable" id="table130"> <property name="visible">True</property> - <property name="n_rows">3</property> - <property name="n_columns">2</property> + <property name="n_rows">1</property> + <property name="n_columns">6</property> <property name="homogeneous">False</property> <property name="row_spacing">2</property> <property name="column_spacing">10</property> @@ -5750,35 +5746,23 @@ </child> <child> - <widget class="GtkLabel" id="pv_on_reboot_label"> + <widget class="GtkComboBox" id="pv-poweroff-combo"> <property name="visible">True</property> - <property name="label" translatable="yes">pv_on_reboot_label</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">1</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> + <property name="items" translatable="yes"></property> + <property name="add_tearoffs">False</property> + <property name="focus_on_click">True</property> </widget> <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">fill</property> - <property name="y_options"></property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">0</property> + <property name="bottom_attach">1</property> + <property name="y_options">fill</property> </packing> </child> <child> - <widget class="GtkLabel" id="pv_on_crash_label"> + <widget class="GtkLabel" id="pv_on_reboot_label"> <property name="visible">True</property> <property name="label" translatable="yes">pv_on_crash_label</property> <property name="use_underline">False</property> @@ -5796,10 +5780,10 @@ <property name="angle">0</property> </widget> <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> + <property name="left_attach">2</property> + <property name="right_attach">3</property> + <property name="top_attach">0</property> + <property name="bottom_attach">1</property> <property name="x_options">fill</property> <property name="y_options"></property> </packing> @@ -5808,47 +5792,55 @@ <child> <widget class="GtkComboBox" id="pv-reboot-combo"> <property name="visible">True</property> - <property name="items" translatable="yes"></property> <property name="add_tearoffs">False</property> <property name="focus_on_click">True</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">fill</property> + <property name="left_attach">3</property> + <property name="right_attach">4</property> + <property name="top_attach">0</property> + <property name="bottom_attach">1</property> <property name="y_options">fill</property> </packing> </child> <child> - <widget class="GtkComboBox" id="pv-crash-combo"> + <widget class="GtkLabel" id="pv_on_crash_label"> <property name="visible">True</property> - <property name="items" translatable="yes"></property> - <property name="add_tearoffs">False</property> - <property name="focus_on_click">True</property> + <property name="label" translatable="yes">pv_on_crash_label</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">1</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> + <property name="left_attach">4</property> + <property name="right_attach">5</property> + <property name="top_attach">0</property> + <property name="bottom_attach">1</property> <property name="x_options">fill</property> - <property name="y_options">fill</property> + <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkComboBox" id="pv-poweroff-combo"> + <widget class="GtkComboBox" id="pv-crash-combo"> <property name="visible">True</property> - <property name="items" translatable="yes"></property> <property name="add_tearoffs">False</property> <property name="focus_on_click">True</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> + <property name="left_attach">5</property> + <property name="right_attach">6</property> <property name="top_attach">0</property> <property name="bottom_attach">1</property> <property name="y_options">fill</property> @@ -6003,7 +5995,7 @@ <property name="label" translatable="yes">r_extra_args_help</property> <property name="use_underline">False</property> <property name="use_markup">True</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="justify">GTK_JUSTIFY_FILL</property> <property name="wrap">True</property> <property name="selectable">False</property> <property name="xalign">0</property> @@ -6018,7 +6010,7 @@ <packing> <property name="padding">0</property> <property name="expand">False</property> - <property name="fill">False</property> + <property name="fill">True</property> </packing> </child> @@ -6124,7 +6116,7 @@ <property name="label" translatable="yes">r_exit_args_help</property> <property name="use_underline">False</property> <property name="use_markup">True</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="justify">GTK_JUSTIFY_FILL</property> <property name="wrap">True</property> <property name="selectable">False</property> <property name="xalign">0</property> @@ -6139,7 +6131,7 @@ <packing> <property name="padding">0</property> <property name="expand">False</property> - <property name="fill">False</property> + <property name="fill">True</property> </packing> </child> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.5.7/src/vminstall/VMSUSE.py new/vm-install-0.5.7/src/vminstall/VMSUSE.py --- old/vm-install-0.5.7/src/vminstall/VMSUSE.py 2011-10-26 21:15:05.000000000 +0200 +++ new/vm-install-0.5.7/src/vminstall/VMSUSE.py 2012-02-16 01:10:36.000000000 +0100 @@ -222,6 +222,8 @@ """Retrieves a Xen-enabled SUSE kernel and initrd from the URL, and copies them to temporary files. Returns the (kernel, initrd) tuple of filenames.""" + if not url: + raise InstSrcError(err=InstSrcError.E_UNDEF) ftp = url.startswith('ftp://') http = url.startswith('http://') nfs = url.startswith('nfs://') -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org