April 2007 - openSUSE Commits - openSUSE Mailing Lists

commit aseqview
by root＠Hilbert.suse.de 03 Apr '07

03 Apr '07

Hello community, here is the log from the commit of package aseqview checked in at Tue Apr 3 20:54:48 CEST 2007. -------- --- aseqview/aseqview.changes 2007-03-29 16:49:24.000000000 +0200 +++ /mounts/work_src_done/STABLE/aseqview/aseqview.changes 2007-04-03 15:13:03.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Apr 3 15:12:35 CEST 2007 - tiwai(a)suse.de + +- updated to version 0.2.6: + * Fix segfault with thread mode (silly typo) + * Add mute-control feature by TAMUKI Shoichi + +------------------------------------------------------------------- Old: ---- aseqview-0.2.5.tar.bz2 New: ---- aseqview-0.2.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aseqview.spec ++++++ --- /var/tmp/diff_new_pack.i20490/_old 2007-04-03 20:54:35.000000000 +0200 +++ /var/tmp/diff_new_pack.i20490/_new 2007-04-03 20:54:35.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package aseqview (Version 0.2.5) +# spec file for package aseqview (Version 0.2.6) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -13,7 +13,7 @@ Name: aseqview BuildRequires: alsa-devel gtk2-devel update-desktop-files Summary: ALSA Sequencer Event Viewer -Version: 0.2.5 +Version: 0.2.6 Release: 1 License: GNU General Public License (GPL) Group: Productivity/Multimedia/Sound/Midi @@ -43,9 +43,7 @@ %build %{?suse_update_config:%{suse_update_config -f}} autoreconf --force --install -CFLAGS="$RPM_OPT_FLAGS" \ -./configure --prefix=%{_prefix} --mandir=%{_mandir} \ - --enable-gtk2 +%configure --enable-gtk2 make %install @@ -68,6 +66,10 @@ %{_datadir}/pixmaps/*.png %changelog +* Tue Apr 03 2007 - tiwai(a)suse.de +- updated to version 0.2.6: + * Fix segfault with thread mode (silly typo) + * Add mute-control feature by TAMUKI Shoichi * Thu Mar 29 2007 - tiwai(a)suse.de - fix races in thread mode * Mon Mar 26 2007 - tiwai(a)suse.de ++++++ aseqview-0.2.5.tar.bz2 -> aseqview-0.2.6.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aseqview-0.2.5/aseqview.c new/aseqview-0.2.6/aseqview.c --- old/aseqview-0.2.5/aseqview.c 2007-03-29 16:28:20.000000000 +0200 +++ new/aseqview-0.2.6/aseqview.c 2007-04-03 15:05:14.000000000 +0200 @@ -90,8 +90,9 @@ int midi_mode; int temper_keysig; int timer_update, queue; + int temper_type_mute; int pitch_adj, vel_scale; - GtkWidget *w_midi_mode, *w_temper_keysig, *w_time; + GtkWidget *w_midi_mode, *w_temper_keysig, *w_time, *w_tt_button[8]; GdkPixmap *w_gm_xpm, *w_gs_xpm, *w_xg_xpm; GdkPixmap *w_gm_xpm_off, *w_gs_xpm_off, *w_xg_xpm_off; GdkPixmap *w_tk_xpm[32], *w_tk_xpm_adj[32], *w_tt_xpm[9]; @@ -111,6 +112,7 @@ }; enum { + UPDATE_MUTE, VEL_COLOR, UPDATE_STATUS, NOTE_ON, @@ -119,7 +121,8 @@ UPDATE_PGM, UPDATE_MODE, UPDATE_TEMPER_KEYSIG, - UPDATE_TEMPER_TYPE + UPDATE_TEMPER_TYPE, + HIDE_TT_BUTTON }; enum { @@ -147,6 +150,7 @@ static int expose_temper_keysig(GtkWidget *); static int expose_temper_type(GtkWidget *); static int update_time(GtkWidget *); +static void suppress_temper_type(GtkToggleButton *, midi_status_t *); static GtkWidget *create_pitch_changer(midi_status_t *); static void adjust_pitch(GtkAdjustment *, midi_status_t *); static GtkWidget *create_velocity_changer(midi_status_t *); @@ -171,6 +175,7 @@ static void reset_all(midi_status_t *, int); static void send_resets(channel_status_t *); static int is_redirect(port_status_t *); +static void av_mute_update(GtkWidget *, int, int); static void set_vel_bar_color(GtkWidget *, int, int); static void av_channel_update(GtkWidget *, int, int); static void av_note_update(GtkWidget *, int, int, int); @@ -179,6 +184,7 @@ static void display_midi_mode(GtkWidget *, int); static void display_temper_keysig(GtkWidget *, int); static void display_temper_type(GtkWidget *, int); +static void av_hide_tt_button(GtkWidget *, int, int); static void av_ringbuf_init(void); static int av_ringbuf_read(int *, GtkWidget **, long *); static int av_ringbuf_write(int, GtkWidget *, long); @@ -613,10 +619,12 @@ static GtkWidget *display_midi_init(GtkWidget *window, midi_status_t *st) { int i; - GtkWidget *vbox, *hbox, *w; + GtkWidget *vbox, *hbox, *w, *table; + gchar *tmp[] = { "eq.", "Py.", "mt.", "pu.", "u0", "u1", "u2", "u3" }; st->midi_mode = MIDI_MODE_GM; st->temper_keysig = TEMPER_UNKNOWN; + st->temper_type_mute = 0; st->w_gm_xpm = create_midi_pixmap(window, gm_bits, gm_width, gm_height, 1, NULL); st->w_gs_xpm = create_midi_pixmap(window, @@ -640,6 +648,7 @@ tt_bits[i], tt_width, tt_height, 2, tt_rgb[i]); vbox = gtk_vbox_new(FALSE, 0); hbox = gtk_hbox_new(FALSE, 0); + gtk_container_border_width(GTK_CONTAINER(hbox), 10); w = st->w_midi_mode = gtk_drawing_area_new(); gtk_drawing_area_size(GTK_DRAWING_AREA(w), gm_width + gs_width + xg_width + 20, gm_height); @@ -659,11 +668,28 @@ gtk_widget_show(w); gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0); gtk_widget_show(hbox); + hbox = gtk_hbox_new(FALSE, 0); + gtk_container_border_width(GTK_CONTAINER(hbox), 10); w = st->w_time = gtk_label_new("00:00"); gtk_object_set_user_data(GTK_OBJECT(w), st); gtk_timeout_add(1000, (GtkFunction) update_time, (gpointer) w); - gtk_box_pack_start(GTK_BOX(vbox), w, TRUE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(hbox), w, TRUE, TRUE, 0); gtk_widget_show(w); + table = gtk_table_new(4, 2, FALSE); + for (i = 0; i < 8; i++) { + w = st->w_tt_button[i] = gtk_toggle_button_new_with_label(tmp[i]); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w), FALSE); + gtk_toggle_button_set_mode(GTK_TOGGLE_BUTTON(w), TRUE); + gtk_signal_connect(GTK_OBJECT(w), "clicked", + GTK_SIGNAL_FUNC(suppress_temper_type), st); + gtk_table_attach_defaults(GTK_TABLE(table), + w, i % 4, i % 4 + 1, i / 4, i / 4 + 1); + gtk_widget_show(w); + } + gtk_box_pack_start(GTK_BOX(hbox), table, TRUE, TRUE, 0); + gtk_widget_show(table); + gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0); + gtk_widget_show(hbox); return vbox; } @@ -752,7 +778,7 @@ int x_ofs = (width - tt_width) / 2; int y_ofs = (height - tt_height - 6) / 2; - i = (tk == TEMPER_UNKNOWN) ? 0 : ((tt < 0x40) ? tt : tt - 0x3c) + 1; + i = (tk == TEMPER_UNKNOWN) ? 0 : tt - ((tt >= 0x40) ? 0x3c : 0) + 1; p = st->w_tt_xpm[i]; gdk_draw_pixmap(w->window, w->style->fg_gc[GTK_STATE_NORMAL], p, 0, 0, x_ofs, y_ofs, tt_width, tt_height); @@ -791,6 +817,29 @@ } /* + */ +static void suppress_temper_type(GtkToggleButton *w, midi_status_t *st) +{ + int i, p; + port_status_t *port; + channel_status_t *chst; + + for (i = 0; i < 8; i++) + if (w == GTK_TOGGLE_BUTTON(st->w_tt_button[i])) + st->temper_type_mute ^= 1 << i; + for (p = 0; p < st->num_ports; p++) { + if ((port = &st->ports[p])->index < 0) + continue; + for (i = 0; i < MIDI_CHANNELS; i++) { + chst = &port->ch[i]; + av_mute_update(chst->w_chnum, + st->temper_type_mute & 1 << chst->temper_type + - ((chst->temper_type >= 0x40) ? 0x3c : 0), use_thread); + } + } +} + +/* * create pitch changer */ static GtkWidget *create_pitch_changer(midi_status_t *st) @@ -988,17 +1037,14 @@ { int key, vel, key_saved, vel_saved; - if (snd_seq_ev_is_channel_type(ev)) { - /* normal MIDI events - check channel */ - if (ev->data.note.channel >= MIDI_CHANNELS) - return; - /* abondoned if muted */ + /* normal MIDI events - check channel */ + if (snd_seq_ev_is_channel_type(ev) + && ev->data.note.channel >= MIDI_CHANNELS) + return; + if (snd_seq_ev_is_note_type(ev)) { + /* abandoned if muted */ if (port->ch[ev->data.note.channel].mute) return; - } - snd_seq_ev_set_direct(ev); - snd_seq_ev_set_subs(ev); - if (snd_seq_ev_is_note_type(ev)) { /* modify key / velocity for note events */ key_saved = ev->data.note.note; vel_saved = ev->data.note.velocity; @@ -1012,11 +1058,16 @@ vel = 127; ev->data.note.note = key; ev->data.note.velocity = vel; + snd_seq_ev_set_direct(ev); + snd_seq_ev_set_subs(ev); port_write_event(port->port, ev, 0); ev->data.note.note = key_saved; ev->data.note.velocity = vel_saved; - } else + } else { + snd_seq_ev_set_direct(ev); + snd_seq_ev_set_subs(ev); port_write_event(port->port, ev, 0); + } } /* @@ -1050,8 +1101,7 @@ } } if (show_piano) - av_note_update(chst->w_piano, - key, (chst->vel[key] > 0) ? 1 : 0, in_buf); + av_note_update(chst->w_piano, key, (chst->vel[key] > 0), in_buf); } /* @@ -1178,7 +1228,7 @@ 0x43, 0x10, 0x4c, 0x00, 0x00, 0x7e, 0x00 }; midi_status_t *st = port->main; - int p, tt, i; + int p, need_visualize = FALSE, tt, i; channel_status_t *chst; if (len <= 0 || buf[0] != 0xf0) @@ -1225,9 +1275,11 @@ switch (buf[3]) { case 0x0a: if (st->temper_keysig == TEMPER_UNKNOWN) - visualize_temper_type(st, in_buf); + need_visualize = TRUE; st->temper_keysig = buf[4] - 0x40 + buf[5] * 16; display_temper_keysig(st->w_temper_keysig, in_buf); + if (need_visualize) + visualize_temper_type(st, in_buf); break; case 0x0b: tt = (buf[4] & 0x03) << 14 | buf[5] << 7 | buf[6]; @@ -1238,6 +1290,10 @@ chst = &port->ch[i]; chst->temper_type = buf[7]; display_temper_type(chst->w_temper_type, in_buf); + if (st->temper_type_mute) + av_mute_update(chst->w_chnum, + st->temper_type_mute & 1 << buf[7] + - ((buf[7] >= 0x40) ? 0x3c : 0), in_buf); } break; } @@ -1269,6 +1325,8 @@ display_temper_type(chst->w_temper_type, in_buf); } } + for (i = 0; i < 8; i++) + av_hide_tt_button(st->w_tt_button[i], FALSE, in_buf); } /* @@ -1276,7 +1334,7 @@ */ static void reset_all(midi_status_t *st, int in_buf) { - int p, i, j; + int p, i; port_status_t *port; channel_status_t *chst; @@ -1285,6 +1343,9 @@ continue; for (i = 0; i < MIDI_CHANNELS; i++) { chst = &port->ch[i]; + if (st->temper_type_mute) + av_mute_update(chst->w_chnum, + st->temper_type_mute & 1, in_buf); all_sounds_off(chst, 0); chst->is_drum = (i == 9) ? 1 : 0; set_vel_bar_color(chst->w_vel, chst->is_drum, in_buf); @@ -1306,6 +1367,8 @@ st->temper_keysig = TEMPER_UNKNOWN; display_temper_keysig(st->w_temper_keysig, 0); st->timer_update = TRUE; + for (i = 0; i < 8; i++) + av_hide_tt_button(st->w_tt_button[i], TRUE, in_buf); } /* @@ -1341,6 +1404,16 @@ } /* + */ +static void av_mute_update(GtkWidget *w, int is_mute, int in_buf) +{ + if (in_buf) + av_ringbuf_write(UPDATE_MUTE, w, is_mute); + else + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w), is_mute); +} + +/* * set color of velocity bar */ static void set_vel_bar_color(GtkWidget *w, int is_drum, int in_buf) @@ -1383,13 +1456,13 @@ */ static void av_piano_reset(GtkWidget *w, int in_buf) { + int i; + if (in_buf) av_ringbuf_write(PIANO_RESET, w, 0); - else { - int i; + else for (i = 0; i < NUM_KEYS; i++) - av_note_update(w, i, 0, 0); - } + av_note_update(w, i, FALSE, 0); } /* @@ -1434,6 +1507,16 @@ /* */ +static void av_hide_tt_button(GtkWidget *w, int is_hide, int in_buf) +{ + if (in_buf) + av_ringbuf_write(HIDE_TT_BUTTON, w, is_hide); + else + gtk_toggle_button_set_mode(GTK_TOGGLE_BUTTON(w), is_hide); +} + +/* + */ struct av_ringbuf { int type; GtkWidget *w; @@ -1510,12 +1593,15 @@ */ static gboolean idle_cb(gpointer data) { - int type, i; + int type; GtkWidget *w; long val; while (av_ringbuf_read(&type, &w, &val)) { switch (type) { + case UPDATE_MUTE: + av_mute_update(w, val, 0); + break; case VEL_COLOR: set_vel_bar_color(w, val, 0); break; @@ -1523,10 +1609,10 @@ av_channel_update(w, val, 0); break; case NOTE_ON: - av_note_update(w, val, 1, 0); + av_note_update(w, val, TRUE, 0); break; case NOTE_OFF: - av_note_update(w, val, 0, 0); + av_note_update(w, val, FALSE, 0); break; case PIANO_RESET: av_piano_reset(w, 0); @@ -1543,6 +1629,9 @@ case UPDATE_TEMPER_TYPE: display_temper_type(w, 0); break; + case HIDE_TT_BUTTON: + av_hide_tt_button(w, val, 0); + break; } } usleep(1000); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aseqview-0.2.5/ChangeLog new/aseqview-0.2.6/ChangeLog --- old/aseqview-0.2.5/ChangeLog 2007-03-29 15:55:21.000000000 +0200 +++ new/aseqview-0.2.6/ChangeLog 2007-04-03 15:06:27.000000000 +0200 @@ -1,3 +1,6 @@ +0.2.6 - Fix segfault with thread mode (silly typo) + - Add mute-control feature by TAMUKI Shoichi + 0.2.5 - Fix possible segfaults due to races in thread mode 0.2.4 - Added MIDI Tunig Standard (MTS) feature diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aseqview-0.2.5/configure new/aseqview-0.2.6/configure --- old/aseqview-0.2.5/configure 2007-03-29 15:57:06.000000000 +0200 +++ new/aseqview-0.2.6/configure 2007-04-03 15:07:04.000000000 +0200 @@ -2075,7 +2075,7 @@ # Define the identity of the package. PACKAGE=aseqview - VERSION=0.2.5 + VERSION=0.2.6 cat >>confdefs.h <<_ACEOF diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aseqview-0.2.5/configure.in new/aseqview-0.2.6/configure.in --- old/aseqview-0.2.5/configure.in 2007-03-29 15:55:41.000000000 +0200 +++ new/aseqview-0.2.6/configure.in 2007-04-03 15:06:39.000000000 +0200 @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(configure.in) -AM_INIT_AUTOMAKE(aseqview, 0.2.5) +AM_INIT_AUTOMAKE(aseqview, 0.2.6) AM_CONFIG_HEADER(config.h) AC_PROG_CC diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aseqview-0.2.5/portlib.c new/aseqview-0.2.6/portlib.c --- old/aseqview-0.2.5/portlib.c 2007-03-29 14:56:48.000000000 +0200 +++ new/aseqview-0.2.6/portlib.c 2007-04-03 15:02:03.000000000 +0200 @@ -46,7 +46,7 @@ port_t *ports; int running; int use_pthread; - pthread_mutex_t *lock; + pthread_mutex_t lock; }; struct port_t { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 alsa-plugins
by root＠Hilbert.suse.de 03 Apr '07

03 Apr '07

Hello community, here is the log from the commit of package alsa-plugins checked in at Tue Apr 3 20:54:28 CEST 2007. -------- --- alsa-plugins/alsa-plugins.changes 2007-03-14 17:24:21.000000000 +0100 +++ /mounts/work_src_done/STABLE/alsa-plugins/alsa-plugins.changes 2007-04-03 14:54:21.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Apr 3 14:53:37 CEST 2007 - tiwai(a)suse.de + +- Add explicitly jack and pulseaudio to Requires of each sub + package. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ alsa-plugins-a52.spec ++++++ --- /var/tmp/diff_new_pack.p19537/_old 2007-04-03 20:53:55.000000000 +0200 +++ /var/tmp/diff_new_pack.p19537/_new 2007-04-03 20:53:55.000000000 +0200 @@ -16,7 +16,7 @@ URL: http://www.alsa-project.org/ Summary: A52 Encoding Plug-In for the ALSA Library Version: 1.0.13 -Release: 15 +Release: 19 License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL) Group: System/Libraries Autoreqprov: on ++++++ alsa-plugins.spec ++++++ --- /var/tmp/diff_new_pack.p19537/_old 2007-04-03 20:53:55.000000000 +0200 +++ /var/tmp/diff_new_pack.p19537/_new 2007-04-03 20:53:55.000000000 +0200 @@ -16,7 +16,7 @@ URL: http://www.alsa-project.org/ Summary: Extra Plug-Ins for the ALSA Library Version: 1.0.13 -Release: 15 +Release: 19 License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL) Group: System/Libraries Autoreqprov: on @@ -37,6 +37,7 @@ Summary: JACK I/O Plug-In for the ALSA Library Group: System/Libraries License: GNU Library General Public License v. 2.0 and 2.1 (LGPL) +Requires: jack %description jack This package contains the JACK (Jack Audio Connection Kit) I/O plug-in @@ -53,6 +54,7 @@ Summary: Polypaudio Plug-In for the ALSA Library Group: System/Libraries License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL) +Requires: pulseaudio %description pulse This package contains the polypaudio I/O plug-in for the ALSA library. @@ -130,6 +132,9 @@ %{_libdir}/alsa-lib/libasound_module_pcm_alsa_dsp.so %changelog +* Tue Apr 03 2007 - tiwai(a)suse.de +- Add explicitly jack and pulseaudio to Requires of each sub + package. * Wed Mar 14 2007 - tiwai(a)suse.de - updated to version 1.0.14rc3: * fix input/output_frames calculation in samplerate plugin ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 OpenOffice_org
by root＠Hilbert.suse.de 03 Apr '07

03 Apr '07

Hello community, here is the log from the commit of package OpenOffice_org checked in at Tue Apr 3 20:51:38 CEST 2007. -------- --- arch/i386/OpenOffice_org/OpenOffice_org.changes 2007-03-30 21:29:22.000000000 +0200 +++ /mounts/work_src_done/STABLE/OpenOffice_org/OpenOffice_org.changes 2007-04-02 17:55:04.000000000 +0200 @@ -1,0 +2,9 @@ +Mon Apr 2 17:50:44 CEST 2007 - pmladek(a)suse.cz + +- updated ooo-build to 2.1.10: + * samba locking [n#203737] + * crash in gnome-vfs directory reading; found during the samba locking + fixing + * VBA stuff: rows on active cell fails with row syntax [n#258824] + +------------------------------------------------------------------- Old: ---- minmem ooo-build-2.1.9.tar.gz New: ---- ooo-build-2.1.10.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org.spec ++++++ --- /var/tmp/diff_new_pack.c11349/_old 2007-04-03 20:50:14.000000000 +0200 +++ /var/tmp/diff_new_pack.c11349/_new 2007-04-03 20:50:14.000000000 +0200 @@ -89,12 +89,12 @@ %define ooo_prefix %_libdir %define ooo_home ooo-2.0 %define ooo_build_dir build -%define ooo_build_version 2.1.9 +%define ooo_build_version 2.1.10 %define ooo_build_tag ooe680-m6 License: Artistic License, BSD License and BSD-like Group: Productivity/Office/Suite Version: 2.1 -Release: 15 +Release: 17 Autoreqprov: on PreReq: coreutils /usr/bin/update-mime-database Prereq: %{?suseconfig_fonts_prereq:%suseconfig_fonts_prereq} @@ -2119,6 +2119,12 @@ %endif %changelog +* Mon Apr 02 2007 - pmladek(a)suse.cz +- updated ooo-build to 2.1.10: + * samba locking [n#203737] + * crash in gnome-vfs directory reading; found during the samba locking + fixing + * VBA stuff: rows on active cell fails with row syntax [n#258824] * Fri Mar 30 2007 - pmladek(a)suse.cz - added flex, bison, and unzip to BuildRequires - removed two dates (around 28 November, 2006) from changes ; they were out ++++++ ooo-build-2.1.9.tar.gz -> ooo-build-2.1.10.tar.gz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.1.9/bin/unpack new/ooo-build-2.1.10/bin/unpack --- old/ooo-build-2.1.9/bin/unpack 2007-03-27 18:53:01.000000000 +0200 +++ new/ooo-build-2.1.10/bin/unpack 2007-04-02 13:30:08.000000000 +0200 @@ -351,7 +351,7 @@ if test -d $OOBUILDDIR/ooo_custom_images/tango/res ; then echo "Installing Tango icon for the GNOME quickstarter applet..." - cp $SRCDIR/tango_mainapp_16.png $OOBUILDDIR/ooo_custom_images/tango/res/mainapp_16.png || exit 1; + cp $TOOLSDIR/src/tango_mainapp_16.png $OOBUILDDIR/ooo_custom_images/tango/res/mainapp_16.png || exit 1; fi if test "x$OOO_EXTRA_ARTWORK" != "x"; then diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.1.9/ChangeLog new/ooo-build-2.1.10/ChangeLog --- old/ooo-build-2.1.9/ChangeLog 2007-03-29 16:14:17.000000000 +0200 +++ new/ooo-build-2.1.10/ChangeLog 2007-04-02 14:12:46.000000000 +0200 @@ -1,6 +1,30 @@ +2007-04-02 Petr Mladek <pmladek(a)suse.cz> + + * Version 2.1.10 (SLED10-SP1-rc2) + +2007-04-02 Jan Holesovsky <kendy(a)suse.cz> + + * patches/src680/config_office-gnome-vfs-lock.diff, + patches/src680/ucb-gnome-vfs-lock.diff, + patches/src680/sfx2-gnome-vfs-lock.diff: Prepare for samba locking + in gnome-vfs, n#203737. + * patches/src680/ucb-gnome-vfs-crashfix.diff: Fix crash in gnome-vfs + directory reading. + * patches/src680/apply: Enable the changes. + +2007-04-02 Andreas Proschofsky <suka(a)gentoo.org> + + * bin/unpack: Fix another wrong use of $SRCDIR + +2007-03-29 Noel Power <noel.power(a)novell.com> + + * patches/vba/sc-source-ui-vba-vbarange-cxx.diff: fix for n#258824 + * scratch/sc-vba/vbarange.cxx: + * test/macro/TestAddress.xls: added testcases for above + 2007-03-29 Petr Mladek <pmladek(a)suse.cz> - * Version 2.1.9 (SLED10-SP1-rc2) + * Version 2.1.9 * patches/src680/nsplugin-path.diff: allow to use only NPP_PATH_MAX-1 bytes by readlink(); the last byte must be reserved for '\0' diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.1.9/configure new/ooo-build-2.1.10/configure --- old/ooo-build-2.1.9/configure 2007-03-29 20:31:23.000000000 +0200 +++ new/ooo-build-2.1.10/configure 2007-04-02 17:47:55.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.60 for ooo-build 2.1.9. +# Generated by GNU Autoconf 2.60 for ooo-build 2.1.10. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. @@ -557,8 +557,8 @@ # Identity of this package. PACKAGE_NAME='ooo-build' PACKAGE_TARNAME='ooo-build' -PACKAGE_VERSION='2.1.9' -PACKAGE_STRING='ooo-build 2.1.9' +PACKAGE_VERSION='2.1.10' +PACKAGE_STRING='ooo-build 2.1.10' PACKAGE_BUGREPORT='' ac_unique_file="bin/build-ooo" @@ -1273,7 +1273,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 ooo-build 2.1.9 to adapt to many kinds of systems. +\`configure' configures ooo-build 2.1.10 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1339,7 +1339,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ooo-build 2.1.9:";; + short | recursive ) echo "Configuration of ooo-build 2.1.10:";; esac cat <<\_ACEOF @@ -1601,7 +1601,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ooo-build configure 2.1.9 +ooo-build configure 2.1.10 generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1615,7 +1615,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by ooo-build $as_me 2.1.9, which was +It was created by ooo-build $as_me 2.1.10, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -2294,7 +2294,7 @@ # Define the identity of the package. PACKAGE='ooo-build' - VERSION='2.1.9' + VERSION='2.1.10' cat >>confdefs.h <<_ACEOF @@ -2522,7 +2522,7 @@ -OOO_BUILDVERSION=2.1.9 +OOO_BUILDVERSION=2.1.10 PROPAGATED_ARGS=$ac_configure_args @@ -6907,7 +6907,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by ooo-build $as_me 2.1.9, which was +This file was extended by ooo-build $as_me 2.1.10, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -6954,7 +6954,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -ooo-build config.status 2.1.9 +ooo-build config.status 2.1.10 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/ooo-build-2.1.9/configure.in new/ooo-build-2.1.10/configure.in --- old/ooo-build-2.1.9/configure.in 2007-03-29 16:15:53.000000000 +0200 +++ new/ooo-build-2.1.10/configure.in 2007-04-02 14:07:01.000000000 +0200 @@ -1,4 +1,4 @@ -AC_INIT(ooo-build, 2.1.9) +AC_INIT(ooo-build, 2.1.10) AC_PREREQ(2.51) AC_CONFIG_SRCDIR(bin/build-ooo) AC_PREFIX_DEFAULT(/usr) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.1.9/NEWS new/ooo-build-2.1.10/NEWS --- old/ooo-build-2.1.9/NEWS 2007-03-29 20:24:28.000000000 +0200 +++ new/ooo-build-2.1.10/NEWS 2007-04-02 14:13:16.000000000 +0200 @@ -1,3 +1,12 @@ +ooo-build-2.1.10 + + + bug fixes: + + samba locking (Jan) + + crash in gnome-vfs directory reading (Jan) + + rows on active cell fails with row syntax (Noel) + + built bits: + + wrong use of $SRCDIR (Andreas) + ooo-build-2.1.9 + features: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.1.9/patches/src680/apply new/ooo-build-2.1.10/patches/src680/apply --- old/ooo-build-2.1.9/patches/src680/apply 2007-03-28 21:02:04.000000000 +0200 +++ new/ooo-build-2.1.10/patches/src680/apply 2007-04-02 14:06:43.000000000 +0200 @@ -15,7 +15,7 @@ Icons, Branding, VBABits, VBAObjects, CalcFixes, Leaks, Egg, \ QuickStartTray, SpeedImageList, GStreamer, Shrink LinuxCommon : Common, FontConfigTemporaryHacks, 64bitTemporaryHacks, FedoraFixes, BuildBitsLinuxOnly, LinuxOnly, NotMacOSX, SystemBits, CWSBackports, GCJ, \ - QPro, Lwp, cairocanvas, msaccess, KDE, \ + QPro, Lwp, cairocanvas, msaccess, KDE, GnomeVFS, \ 64bitPatches, Fpickers, Mono, AddressBooks, QuickStarter MacOSXCommon : Common, SystemBits, CWSBackports, Lwp, 64bitPatches Win32Common : Common, FontConfigTemporaryHacks, 64bitTemporaryHacks, Win32Only, NotDebian, NotMacOSX @@ -419,6 +419,19 @@ accept-underscores-in-hostnames.diff, n#182422, tml + +[ GnomeVFS ] +# Locking for gnome-vfs +# FIXME: file upstream when the correctness proven +ucb-gnome-vfs-lock.diff, n#203737, jholesov +sfx2-gnome-vfs-lock.diff, n#203737, jholesov +config_office-gnome-vfs-lock.diff, n#203737, jholesov + +# Fix crash in reading the directories +# FIXME: file upstream together with the above +ucb-gnome-vfs-crashfix.diff, i#0, jholesov + + [ BFFixes ] # && where & should be diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.1.9/patches/src680/config_office-gnome-vfs-lock.diff new/ooo-build-2.1.10/patches/src680/config_office-gnome-vfs-lock.diff --- old/ooo-build-2.1.9/patches/src680/config_office-gnome-vfs-lock.diff 1970-01-01 01:00:00.000000000 +0100 +++ new/ooo-build-2.1.10/patches/src680/config_office-gnome-vfs-lock.diff 2007-04-02 14:06:43.000000000 +0200 @@ -0,0 +1,41 @@ +--- config_office/configure.in 2007-03-22 16:54:38.000000000 +0100 ++++ config_office/configure.in 2007-03-29 15:24:14.000000000 +0200 +@@ -5030,16 +5030,28 @@ dnl Gnome VFS check + dnl =================================================================== + + ENABLE_GNOMEVFS="" ++GNOMEVFS_HAS_LOCKING="" + AC_MSG_CHECKING([whether to enable GNOME VFS support]) + if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_gnome_vfs" = "yes"; then + ENABLE_GNOMEVFS="TRUE" + AC_MSG_RESULT([yes]) + PKG_CHECK_MODULES( GNOMEVFS, gnome-vfs-2.0 >= 2.6.0 ) + PKG_CHECK_MODULES( GCONF, gconf-2.0 ) ++ ++ AC_LANG_SAVE ++ AC_LANG_CPLUSPLUS ++ save_CXXFLAGS=$CXXFLAGS ++ CXXFLAGS="$CXXFLAGS $GNOMEVFS_CFLAGS" ++ AC_CHECK_DECL(GNOME_VFS_OPEN_LOCKED, ++ GNOMEVFS_HAS_LOCKING="YES",, ++ [#include <libgnomevfs/gnome-vfs-handle.h>]) ++ CXXFLAGS=$save_CXXFLAGS ++ AC_LANG_RESTORE + else + AC_MSG_RESULT([no]) + fi + AC_SUBST(ENABLE_GNOMEVFS) ++AC_SUBST(GNOMEVFS_HAS_LOCKING) + + dnl =================================================================== + dnl Check whether the gtk 2.0 libraries are available. +--- config_office/set_soenv.in 2007-03-22 16:54:38.000000000 +0100 ++++ config_office/set_soenv.in 2007-03-29 15:17:34.000000000 +0200 +@@ -1549,6 +1549,7 @@ ToFile( "DBUS_PACKAGE", "@DBUS_PACK + ToFile( "ENABLE_CAIRO", "@ENABLE_CAIRO@", "e" ); + ToFile( "ENABLE_GSTREAMER", "@ENABLE_GSTREAMER@", "e" ); + ToFile( "ENABLE_GNOMEVFS", "@ENABLE_GNOMEVFS@", "e" ); ++ToFile( "GNOMEVFS_HAS_LOCKING","@GNOMEVFS_HAS_LOCKING@", "e" ); + ToFile( "ENABLE_KDE", "@ENABLE_KDE@", "e" ); + ToFile( "KDE_CFLAGS", "@KDE_CFLAGS@", "e" ); + ToFile( "KDE_LIBS", "@KDE_LIBS@", "e" ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.1.9/patches/src680/sfx2-gnome-vfs-lock.diff new/ooo-build-2.1.10/patches/src680/sfx2-gnome-vfs-lock.diff --- old/ooo-build-2.1.9/patches/src680/sfx2-gnome-vfs-lock.diff 1970-01-01 01:00:00.000000000 +0100 +++ new/ooo-build-2.1.10/patches/src680/sfx2-gnome-vfs-lock.diff 2007-04-02 14:06:43.000000000 +0200 @@ -0,0 +1,73 @@ +--- sfx2/inc/docfile.hxx 2006-12-19 15:08:00.000000000 +0100 ++++ sfx2/inc/docfile.hxx 2007-03-28 16:22:21.000000000 +0200 +@@ -303,6 +303,7 @@ public: + SAL_DLLPRIVATE ::rtl::OUString GetOutputStorageURL_Impl(); + SAL_DLLPRIVATE BOOL HasStorage_Impl() const; + ++ SAL_DLLPRIVATE sal_Bool SupportsActiveStreaming_Impl( const rtl::OUString &rName ); + SAL_DLLPRIVATE sal_Bool BasedOnOriginalFile_Impl(); + SAL_DLLPRIVATE void StorageBackup_Impl(); + SAL_DLLPRIVATE ::rtl::OUString GetBackup_Impl(); +--- sfx2/source/doc/docfile.cxx 2007-03-23 18:06:52.000000000 +0100 ++++ sfx2/source/doc/docfile.cxx 2007-03-28 16:24:22.000000000 +0200 +@@ -913,11 +913,32 @@ sal_Bool SfxMedium::TryStorage() + } + + //------------------------------------------------------------------ ++sal_Bool SfxMedium::SupportsActiveStreaming_Impl( const rtl::OUString &rName ) ++{ ++ if ( ::utl::LocalFileHelper::IsLocalFile( rName ) ) ++ return sal_True; ++ ++ ::ucb::Content aTmpContent; ++ Reference< ::com::sun::star::ucb::XCommandEnvironment > xDummyEnv; ++ if ( ::ucb::Content::create( GetURLObject().GetMainURL( INetURLObject::NO_DECODE ), xDummyEnv, aTmpContent ) ) ++ { ++ ++ Any aAny = aTmpContent.getPropertyValue( ++ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "SupportsActiveStreaming" )) ); ++ ++ sal_Bool bSupportsStreaming = sal_False; ++ return ( ( aAny >>= bSupportsStreaming ) && bSupportsStreaming ); ++ } ++ ++ return sal_False; ++} ++ ++//------------------------------------------------------------------ + sal_Bool SfxMedium::BasedOnOriginalFile_Impl() + { + return ( !pImp->pTempFile && !( aLogicName.Len() && pImp->m_bSalvageMode ) + && GetURLObject().GetMainURL( INetURLObject::NO_DECODE ).getLength() +- && ::utl::LocalFileHelper::IsLocalFile( GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) ) ++ && SupportsActiveStreaming_Impl( GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) ) + && ::utl::UCBContentHelper::IsDocument( GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) ) ); + } + +@@ -987,7 +1008,7 @@ uno::Reference < embed::XStorage > SfxMe + + // medium based on OutputStream: must work with TempFile + if( aLogicName.CompareToAscii( "private:stream", 14 ) == COMPARE_EQUAL +- || !::utl::LocalFileHelper::IsLocalFile( aLogicName ) ) ++ || !SupportsActiveStreaming_Impl( aLogicName ) ) + CreateTempFileNoCopy(); + // if Medium already contains a stream - TODO/LATER: store stream/outputstream in ImplData, not in Medium + else if ( GetItemSet()->GetItemState( SID_STREAM ) < SFX_ITEM_SET ) +@@ -1131,7 +1152,7 @@ uno::Reference < embed::XStorage > SfxMe + + try + { +- if ( IsReadOnly() && ::utl::LocalFileHelper::IsLocalFile( aLogicName ) ) ++ if ( IsReadOnly() && SupportsActiveStreaming_Impl( aLogicName ) ) + { + //TODO/LATER: performance problem if not controlled by special Mode in SfxMedium + //(should be done only for permanently open storages) +@@ -1946,7 +1946,7 @@ void SfxMedium::Transfer_Impl() + xComEnv = new ::ucb::CommandEnvironment( xInteractionHandler, + Reference< ::com::sun::star::ucb::XProgressHandler >() ); + +- if ( ::utl::LocalFileHelper::IsLocalFile( aDest.GetMainURL( INetURLObject::NO_DECODE ) ) || !aDest.removeSegment() ) ++ if ( SupportsActiveStreaming_Impl( aDest.GetMainURL( INetURLObject::NO_DECODE ) ) || !aDest.removeSegment() ) + { + TransactedTransferForFS_Impl( aSource, aDest, xComEnv ); + } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.1.9/patches/src680/ucb-gnome-vfs-crashfix.diff new/ooo-build-2.1.10/patches/src680/ucb-gnome-vfs-crashfix.diff --- old/ooo-build-2.1.9/patches/src680/ucb-gnome-vfs-crashfix.diff 1970-01-01 01:00:00.000000000 +0100 +++ new/ooo-build-2.1.10/patches/src680/ucb-gnome-vfs-crashfix.diff 2007-04-02 14:06:43.000000000 +0200 @@ -0,0 +1,47 @@ +--- ucb/source/ucp/gvfs/directory.cxx 2006-09-17 15:54:28.000000000 +0200 ++++ ucb/source/ucp/gvfs/directory.cxx 2007-03-30 12:58:58.000000000 +0200 +@@ -374,24 +374,23 @@ sal_Bool DataSupplier::getData() + } + + +- GnomeVFSFileInfo fileInfo; +- fileInfo.name = 0; +- while ((result = gnome_vfs_directory_read_next (dirHandle, &fileInfo)) == GNOME_VFS_OK) { +- if( fileInfo.name && fileInfo.name[0] == '.' && +- ( fileInfo.name[1] == '\0' || +- ( fileInfo.name[1] == '.' && fileInfo.name[2] == '\0' ) ) ) ++ GnomeVFSFileInfo *pFileInfo = gnome_vfs_file_info_new(); ++ while ((result = gnome_vfs_directory_read_next (dirHandle, pFileInfo)) == GNOME_VFS_OK) { ++ if( pFileInfo->name && pFileInfo->name[0] == '.' && ++ ( pFileInfo->name[1] == '\0' || ++ ( pFileInfo->name[1] == '.' && pFileInfo->name[2] == '\0' ) ) ) + continue; + + switch ( m_pImpl->m_nOpenMode ) { + case com::sun::star::ucb::OpenMode::FOLDERS: +- if ( !(fileInfo.valid_fields & GNOME_VFS_FILE_INFO_FIELDS_TYPE) || +- fileInfo.type != GNOME_VFS_FILE_TYPE_DIRECTORY ) ++ if ( !(pFileInfo->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_TYPE) || ++ pFileInfo->type != GNOME_VFS_FILE_TYPE_DIRECTORY ) + continue; + break; + + case com::sun::star::ucb::OpenMode::DOCUMENTS: +- if ( !(fileInfo.valid_fields & GNOME_VFS_FILE_INFO_FIELDS_TYPE) || +- fileInfo.type != GNOME_VFS_FILE_TYPE_REGULAR ) ++ if ( !(pFileInfo->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_TYPE) || ++ pFileInfo->type != GNOME_VFS_FILE_TYPE_REGULAR ) + continue; + break; + +@@ -400,8 +399,9 @@ sal_Bool DataSupplier::getData() + break; + } + +- m_pImpl->m_aResults.push_back( new ResultListEntry( &fileInfo ) ); ++ m_pImpl->m_aResults.push_back( new ResultListEntry( pFileInfo ) ); + } ++ g_free( pFileInfo ); + #ifdef DEBUG + g_warning ("Got %d directory entries", result); + #endif diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.1.9/patches/src680/ucb-gnome-vfs-lock.diff new/ooo-build-2.1.10/patches/src680/ucb-gnome-vfs-lock.diff --- old/ooo-build-2.1.9/patches/src680/ucb-gnome-vfs-lock.diff 1970-01-01 01:00:00.000000000 +0100 +++ new/ooo-build-2.1.10/patches/src680/ucb-gnome-vfs-lock.diff 2007-04-02 14:06:43.000000000 +0200 @@ -0,0 +1,432 @@ +--- ucb/source/ucp/gvfs/content.cxx 2007-03-26 13:35:09.000000000 +0200 ++++ ucb/source/ucp/gvfs/content.cxx 2007-03-28 14:59:26.000000000 +0200 +@@ -60,6 +60,9 @@ + #ifndef _COM_SUN_STAR_IO_XOUTPUTSTREAM_HPP_ + #include <com/sun/star/io/XOutputStream.hpp> + #endif ++#ifndef _COM_SUN_STAR_IO_XACTIVEDATASTREAMER_HPP_ ++#include <com/sun/star/io/XActiveDataStreamer.hpp> ++#endif + #ifndef _COM_SUN_STAR_LANG_ILLEGALACCESSEXCEPTION_HPP_ + #include <com/sun/star/lang/IllegalAccessException.hpp> + #endif +@@ -90,6 +93,9 @@ + #ifndef _COM_SUN_STAR_UCB_INTERACTIVENETWORKWRITEEXCEPTION_HPP_ + #include <com/sun/star/ucb/InteractiveNetworkWriteException.hpp> + #endif ++#ifndef _COM_SUN_STAR_UCB_IOERRORCODE_HPP_ ++#include <com/sun/star/ucb/IOErrorCode.hpp> ++#endif + #ifndef _COM_SUN_STAR_UCB_NAMECLASH_HPP_ + #include <com/sun/star/ucb/NameClash.hpp> + #endif +@@ -204,7 +210,8 @@ Content::Content( + throw ( star::ucb::ContentCreationException ) + : ContentImplHelper( rxSMgr, pProvider, Identifier ), + m_pProvider( pProvider ), +- m_bTransient( sal_False ) ++ m_bTransient( sal_False ), ++ m_bForceReadOnly( sal_False ) + { + CLEAR_INFO (&m_info); + #ifdef DEBUG +@@ -221,7 +228,8 @@ Content::Content( const ::com::sun::star + throw ( ::com::sun::star::ucb::ContentCreationException ) + : ContentImplHelper( rxSMgr, pProvider, Identifier ), + m_pProvider( pProvider ), +- m_bTransient( sal_True ) ++ m_bTransient( sal_True ), ++ m_bForceReadOnly( sal_False ) + { + CLEAR_INFO (&m_info); + +@@ -699,7 +707,9 @@ uno::Reference< sdbc::XRow > Content::ge + } + + else if (rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsReadOnly" ) ) ) { +- if (m_info.valid_fields & GNOME_VFS_FILE_INFO_FIELDS_PERMISSIONS) { ++ if ( m_bForceReadOnly ) ++ xRow->appendBoolean( rProp, sal_True ); ++ else if (m_info.valid_fields & GNOME_VFS_FILE_INFO_FIELDS_PERMISSIONS) { + bool read_only = true; + + if (m_info.uid == getuid () && +@@ -742,6 +752,9 @@ uno::Reference< sdbc::XRow > Content::ge + g_warning ("FIXME: Requested mime-type - an expensive op. indeed!"); + #endif + xRow->appendVoid( rProp ); ++ } ++ else if (rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "SupportsActiveStreaming" ) ) ) { ++ xRow->appendBoolean( rProp, sal_True ); + } else { + xRow->appendVoid( rProp ); + } +@@ -986,6 +999,8 @@ void Content::insert( + { + osl::ClearableGuard< osl::Mutex > aGuard( m_aMutex ); + ++ GnomeVFSOpenMode nOpenMode; ++ + #ifdef DEBUG + g_warning( "Insert '%s' (%d) (0x%x:%d)", getURI(), bReplaceExisting, + m_info.valid_fields, m_info.type ); +@@ -1038,22 +1053,27 @@ void Content::insert( + result = GNOME_VFS_OK; + if ( bReplaceExisting ) { + Authentication aAuth( xEnv ); +- result = gnome_vfs_open( &handle, (const sal_Char *)aURI, +- GNOME_VFS_OPEN_WRITE ); ++ nOpenMode = (GnomeVFSOpenMode)(GNOME_VFS_OPEN_WRITE | GNOME_VFS_OPEN_LOCKED); ++ result = gnome_vfs_open( &handle, (const sal_Char *)aURI, nOpenMode ); + } + +- if ( result != GNOME_VFS_OK ) { ++ if ( result == GNOME_VFS_ERROR_LOCKED ) ++ throwLocked( xEnv ); ++ else if ( result != GNOME_VFS_OK ) { + int perm; + Authentication aAuth( xEnv ); + + perm = ( ( GNOME_VFS_PERM_USER_WRITE | GNOME_VFS_PERM_USER_READ ) | + ( GNOME_VFS_PERM_GROUP_WRITE | GNOME_VFS_PERM_GROUP_READ ) ); + ++ nOpenMode = (GnomeVFSOpenMode)(GNOME_VFS_OPEN_WRITE | GNOME_VFS_OPEN_LOCKED); + result = gnome_vfs_create +- ( &handle, (const sal_Char *)aURI, GNOME_VFS_OPEN_WRITE, TRUE, perm ); ++ ( &handle, (const sal_Char *)aURI, nOpenMode, TRUE, perm ); + } + +- if( result != GNOME_VFS_OK ) ++ if ( result == GNOME_VFS_ERROR_LOCKED ) ++ throwLocked( xEnv ); ++ else if ( result != GNOME_VFS_OK ) + cancelCommandExecution( result, xEnv, sal_True ); + + if ( !xInputStream.is() ) { +@@ -1063,7 +1083,7 @@ void Content::insert( + + } else { // copy it over + uno::Reference < io::XOutputStream > xOutput = +- new gvfs::Stream( handle, &m_info ); ++ new gvfs::Stream( handle, &m_info, (const sal_Char *)aURI, nOpenMode ); + + copyData( xInputStream, xOutput ); + } +@@ -1362,6 +1382,22 @@ void Content::cancelCommandExecution( + // Unreachable + } + ++void Content::throwLocked( const uno::Reference< star::ucb::XCommandEnvironment > & xEnv) ++ throw( uno::Exception ) ++{ ++#ifdef DEBUG ++ g_warning( "File locked, throwing IOErrorCode_LOCKING_VIOLATION" ); ++#endif ++ ++ m_bForceReadOnly = sal_True; ++ ++ ucbhelper::cancelCommandExecution( star::ucb::IOErrorCode_LOCKING_VIOLATION, ++ uno::Sequence< uno::Any >( 0 ), // FIXME more info about the file? ++ xEnv, ++ rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "an error occured during file opening" ) ), ++ this ); ++} ++ + uno::Sequence< beans::Property > Content::getProperties( + const uno::Reference< com::sun::star::ucb::XCommandEnvironment > & /*xEnv*/ ) + { +@@ -1403,6 +1439,10 @@ uno::Sequence< beans::Property > Content + beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), + beans::Property( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsHidden" ) ), + -1, getCppuBooleanType(), ++ beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ), ++ ++ beans::Property( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SupportsActiveStreaming" ) ), ++ -1, getCppuBooleanType(), + beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ) + }; + +@@ -1498,6 +1538,7 @@ Content::createTempStream( const ::com:: + GnomeVFSResult result; + GnomeVFSHandle *handle = NULL; + ::rtl::OString aURI = getOURI(); ++ GnomeVFSOpenMode nOpenMode = GNOME_VFS_OPEN_READ; + + osl::Guard< osl::Mutex > aGuard( m_aMutex ); + // Something badly wrong happened - can't seek => stream to a temporary file +@@ -1509,60 +1550,64 @@ Content::createTempStream( const ::com:: + if ( !xTempOut.is() ) + cancelCommandExecution( GNOME_VFS_ERROR_IO, xEnv ); + +- result = gnome_vfs_open +- ( &handle, (const sal_Char *)aURI, GNOME_VFS_OPEN_READ ); ++ result = gnome_vfs_open( &handle, (const sal_Char *)aURI, nOpenMode ); + if (result != GNOME_VFS_OK) + cancelCommandExecution( result, xEnv ); + +- uno::Reference < io::XInputStream > pStream = new ::gvfs::Stream( handle, &m_info ); ++ uno::Reference < io::XInputStream > pStream = new ::gvfs::Stream( handle, &m_info, (const sal_Char *)aURI, nOpenMode ); + copyData( pStream, xTempOut ); + + return uno::Reference < io::XInputStream > ( xTempOut, uno::UNO_QUERY ); + } + + ::com::sun::star::uno::Reference< +- ::com::sun::star::io::XInputStream > +-Content::createInputStream( const ::com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& xEnv ) ++ ::com::sun::star::io::XStream > ++Content::createStream( const ::com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& xEnv, ++ bool bReadWrite ) + throw( ::com::sun::star::uno::Exception ) + { + GnomeVFSHandle *handle = NULL; + GnomeVFSResult result; +- uno::Reference<io::XInputStream > xIn; ++ uno::Reference<io::XStream > xStream; + + Authentication aAuth( xEnv ); +- osl::Guard< osl::Mutex > aGuard( m_aMutex ); ++ osl::Guard< osl::Mutex > aGuard( m_aMutex ); + + getInfo( xEnv ); + ::rtl::OString aURI = getOURI(); + + if ( !(m_info.valid_fields & GNOME_VFS_FILE_INFO_FIELDS_SIZE) ) +- return createTempStream( xEnv ); ++ return xStream; ++ ++ GnomeVFSOpenMode nOpenMode = (GnomeVFSOpenMode)(GNOME_VFS_OPEN_READ | GNOME_VFS_OPEN_RANDOM); ++ if ( bReadWrite ) ++ nOpenMode = (GnomeVFSOpenMode)(nOpenMode | GNOME_VFS_OPEN_WRITE | GNOME_VFS_OPEN_LOCKED); + +- result = gnome_vfs_open +- ( &handle, (const sal_Char *)aURI, +- (GnomeVFSOpenMode) (GNOME_VFS_OPEN_READ | GNOME_VFS_OPEN_RANDOM ) ); ++ result = gnome_vfs_open( &handle, (const sal_Char *)aURI, nOpenMode ); + + if (result == GNOME_VFS_ERROR_INVALID_OPEN_MODE || + result == GNOME_VFS_ERROR_NOT_SUPPORTED) +- return createTempStream( xEnv ); +- +- if (result != GNOME_VFS_OK) ++ return xStream; ++ ++ if (result == GNOME_VFS_ERROR_LOCKED ) ++ throwLocked( xEnv ); ++ else if (result != GNOME_VFS_OK) + cancelCommandExecution( result, xEnv ); + + // Try a seek just to make sure it's Random access: some lie. + result = gnome_vfs_seek( handle, GNOME_VFS_SEEK_START, 0); + if (result == GNOME_VFS_ERROR_NOT_SUPPORTED) { + gnome_vfs_close( handle ); +- return createTempStream( xEnv ); ++ return xStream; + } + + if (result != GNOME_VFS_OK) + cancelCommandExecution( result, xEnv ); + + if (handle != NULL) +- xIn = new ::gvfs::Stream( handle, &m_info ); ++ xStream = new ::gvfs::Stream( handle, &m_info, (const sal_Char *)aURI, nOpenMode ); + +- return xIn; ++ return xStream; + } + + sal_Bool +@@ -1572,25 +1617,53 @@ Content::feedSink( uno::Reference< ::com + if ( !aSink.is() ) + return sal_False; + +- uno::Reference< io::XOutputStream > xOut +- = uno::Reference< io::XOutputStream >(aSink, uno::UNO_QUERY ); +- uno::Reference< io::XActiveDataSink > xDataSink +- = uno::Reference< io::XActiveDataSink >(aSink, uno::UNO_QUERY ); +- +- if ( !xOut.is() && !xDataSink.is() ) +- return sal_False; +- +- uno::Reference< io::XInputStream > xIn = createInputStream( xEnv ); +- if ( !xIn.is() ) +- return sal_False; +- ++ uno::Reference< io::XOutputStream > xOut( aSink, uno::UNO_QUERY ); + if ( xOut.is() ) ++ { ++#ifdef DEBUG ++ g_warning( "feedSink(), using XOutputStream" ); ++#endif ++ uno::Reference< io::XInputStream > xIn( createStream( xEnv, false ), uno::UNO_QUERY ); ++ if ( !xIn.is() ) ++ xIn = createTempStream( xEnv ); ++ if ( !xIn.is() ) ++ return sal_False; ++ + copyData( xIn, xOut ); ++ return sal_True; ++ } + ++ uno::Reference< io::XActiveDataSink > xDataSink( aSink, uno::UNO_QUERY ); + if ( xDataSink.is() ) ++ { ++#ifdef DEBUG ++ g_warning( "feedSink(), using XActiveDataSink" ); ++#endif ++ uno::Reference< io::XInputStream > xIn( createStream( xEnv, false ), uno::UNO_QUERY ); ++ if ( !xIn.is() ) ++ xIn = createTempStream( xEnv ); ++ if ( !xIn.is() ) ++ return sal_False; ++ + xDataSink->setInputStream( xIn ); ++ return sal_True; ++ } ++ ++ uno::Reference< io::XActiveDataStreamer > xDataStreamer( aSink, uno::UNO_QUERY ); ++ if ( xDataStreamer.is() ) ++ { ++#ifdef DEBUG ++ g_warning( "feedSink(), using XActiveDataStreamer" ); ++#endif ++ uno::Reference< io::XStream > xStream = createStream( xEnv, true ); ++ if ( !xStream.is() ) ++ return sal_False; + +- return sal_True; ++ xDataStreamer->setStream( xStream ); ++ return sal_True; ++ } ++ ++ return sal_False; + } + + extern "C" { +--- ucb/source/ucp/gvfs/content.hxx 2007-03-26 13:35:09.000000000 +0200 ++++ ucb/source/ucp/gvfs/content.hxx 2007-03-26 18:51:44.000000000 +0200 +@@ -65,6 +65,7 @@ namespace com { namespace sun { namespac + namespace com { namespace sun { namespace star { namespace io { + class XInputStream; + class XOutputStream; ++ class XStream; + } } } } + + namespace com { namespace sun { namespace star { namespace sdbc { +@@ -108,6 +109,7 @@ private: + ContentProvider *m_pProvider; // No need for a ref, base class holds object + sal_Bool m_bTransient; // A non-existant (as yet) item + GnomeVFSFileInfo m_info; // cached status information ++ sal_Bool m_bForceReadOnly; // behave as read-only + + // Internal helpers + void queryChildren ( ContentRefList& rChildren ); +@@ -182,9 +184,10 @@ private: + com::sun::star::ucb::XCommandEnvironment >& xEnv ) + throw( ::com::sun::star::uno::Exception ); + ::com::sun::star::uno::Reference< +- ::com::sun::star::io::XInputStream > +- createInputStream( const ::com::sun::star::uno::Reference< +- com::sun::star::ucb::XCommandEnvironment >& xEnv ) ++ ::com::sun::star::io::XStream > ++ createStream( const ::com::sun::star::uno::Reference< ++ com::sun::star::ucb::XCommandEnvironment >& xEnv, ++ bool bReadWrite ) + throw( ::com::sun::star::uno::Exception ); + sal_Bool feedSink( ::com::sun::star::uno::Reference< + ::com::sun::star::uno::XInterface> aSink, +@@ -200,6 +203,9 @@ private: + sal_Bool bWrite = sal_False ) + throw( ::com::sun::star::uno::Exception ); + ++ void throwLocked(const ::com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv) ++ throw( ::com::sun::star::uno::Exception ); ++ + + public: + // Non-interface bits +--- ucb/source/ucp/gvfs/makefile.mk 2007-03-26 13:35:09.000000000 +0200 ++++ ucb/source/ucp/gvfs/makefile.mk 2007-03-23 15:06:26.000000000 +0100 +@@ -61,6 +61,14 @@ CFLAGS+=-gdwarf-2 + PKGCONFIG_LIBS!:=-Wl,--export-dynamic $(PKGCONFIG_LIBS:s/ -llinc//:s/ -lbonobo-activation//:s/ -lgconf-2//:s/ -lORBit-2//:s/ -lIDL-2//:s/ -lgmodule-2.0//:s/ -lgobject-2.0//:s/ -lgthread-2.0//) + .ENDIF # "$(OS)" == "LINUX" + ++.IF "$(debug)" != "" || "$(DEBUG)" != "" ++CFLAGS+=-DDEBUG ++.ENDIF ++ ++.IF "$(GNOMEVFS_HAS_LOCKING)" != "YES" ++CFLAGS+=-DGNOME_VFS_OPEN_LOCKED=0 ++.ENDIF ++ + # no "lib" prefix + DLLPRE = + +--- ucb/source/ucp/gvfs/stream.cxx 2007-03-26 13:35:09.000000000 +0200 ++++ ucb/source/ucp/gvfs/stream.cxx 2007-03-28 14:10:40.000000000 +0200 +@@ -54,10 +54,14 @@ using namespace com::sun::star::ucb; + using namespace gvfs; + + Stream::Stream( GnomeVFSHandle *handle, +- const GnomeVFSFileInfo *aInfo ) : ++ const GnomeVFSFileInfo *aInfo, ++ const gchar *uri, ++ GnomeVFSOpenMode open_mode ) : + m_eof (sal_False), + m_bInputStreamCalled( sal_False ), +- m_bOutputStreamCalled( sal_False ) ++ m_bOutputStreamCalled( sal_False ), ++ m_pURI( g_strdup( uri ) ), ++ m_nOpenMode( open_mode ) + { + m_handle = handle; + gnome_vfs_file_info_copy (&m_info, aInfo); +@@ -69,6 +73,7 @@ Stream::~Stream( void ) + gnome_vfs_close (m_handle); + m_handle = NULL; + } ++ g_free( m_pURI ); + } + + Any Stream::queryInterface( const Type &type ) +@@ -271,7 +276,17 @@ void SAL_CALL Stream::truncate( void ) + if( ! m_handle ) + throw IOException(); + +- throwOnError( gnome_vfs_truncate_handle( m_handle, 0 ) ); ++ GnomeVFSResult result = gnome_vfs_truncate_handle( m_handle, 0 ); ++ ++ if ( result == GNOME_VFS_ERROR_NOT_SUPPORTED ) ++ { ++ result = gnome_vfs_close( m_handle ); ++ m_handle = NULL; ++ if ( result == GNOME_VFS_OK ) ++ result = gnome_vfs_open( &m_handle, m_pURI, (GnomeVFSOpenMode)( m_nOpenMode | GNOME_VFS_OPEN_TRUNCATE ) ); ++ } ++ ++ throwOnError( result ); + } + + // ------------------------------------------------------------------- +--- ucb/source/ucp/gvfs/stream.hxx 2007-03-26 13:35:09.000000000 +0200 ++++ ucb/source/ucp/gvfs/stream.hxx 2007-03-28 14:11:25.000000000 +0200 +@@ -80,6 +80,8 @@ private: + sal_Bool m_eof; + sal_Bool m_bInputStreamCalled; + sal_Bool m_bOutputStreamCalled; ++ gchar *m_pURI; // necessary to be able to simulate gnome_vfs_truncate if not supported ++ GnomeVFSOpenMode m_nOpenMode;// necessary to be able to simulate gnome_vfs_truncate if not supported + + void throwOnError( GnomeVFSResult result ) + throw( ::com::sun::star::io::NotConnectedException, +@@ -94,7 +96,9 @@ private: + + public: + Stream ( GnomeVFSHandle *handle, +- const GnomeVFSFileInfo *aInfo ); ++ const GnomeVFSFileInfo *aInfo, ++ const gchar *uri, ++ GnomeVFSOpenMode open_mode ); + virtual ~Stream(); + + // XInterface diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.1.9/patches/vba/sc-source-ui-vba-vbarange-cxx.diff new/ooo-build-2.1.10/patches/vba/sc-source-ui-vba-vbarange-cxx.diff --- old/ooo-build-2.1.9/patches/vba/sc-source-ui-vba-vbarange-cxx.diff 2007-03-28 20:59:24.000000000 +0200 +++ new/ooo-build-2.1.10/patches/vba/sc-source-ui-vba-vbarange-cxx.diff 2007-04-02 13:30:08.000000000 +0200 @@ -1,6 +1,6 @@ --- /dev/null +++ sc/source/ui/vba/vbarange.cxx -@@ -0,0 +1,3763 @@ +@@ -0,0 +1,3760 @@ +#include <comphelper/processfactory.hxx> +#include <sfx2/objsh.hxx> + @@ -1707,97 +1707,94 @@ +uno::Reference< vba::XRange > +ScVbaRange::Rows(const uno::Any& aIndex ) throw (uno::RuntimeException) +{ -+ // #TODO code within the test below "if ( m_Areas.... " can be removed -+ // Test is performed only because m_xRange is NOT set to be -+ // the first range in m_Areas ( to force failure while -+ // the implementations for each method are being updated ) -+ if ( m_Areas->getCount() > 1 ) -+ { -+ uno::Reference< vba::XRange > xRange( getArea( 0 ), uno::UNO_QUERY_THROW ); -+ return xRange->Rows( aIndex ); -+ } -+ ++ SCROW nStartRow = 0; ++ SCROW nEndRow = 0; ++ + sal_Int32 nValue; + rtl::OUString sAddress; -+ if( aIndex.hasValue() ) ++ ++ if ( aIndex.hasValue() ) + { -+ uno::Reference< sheet::XCellRangeAddressable > xAddressable( mxRange, uno::UNO_QUERY ); -+ table::CellRangeAddress aAddress = xAddressable->getRangeAddress(); ++ ScCellRangesBase* pUnoRangesBase = getCellRangesBase(); ++ ScRangeList aCellRanges = pUnoRangesBase->GetRangeList(); ++ ++ ScRange aRange = *aCellRanges.First(); + if( aIndex >>= nValue ) + { -+ aAddress.StartRow = --nValue; -+ aAddress.EndRow = nValue; ++ aRange.aStart.SetRow( aRange.aStart.Row() + --nValue ); ++ aRange.aEnd.SetRow( aRange.aStart.Row() ); + } -+ ++ + else if ( aIndex >>= sAddress ) + { -+ ScAddress::Details dDetails( ScAddress::CONV_XL_A1, 0, 0 ); -+ ScRange aRange; -+ aRange.ParseRows( sAddress, getDocumentFromRange( mxRange ), dDetails ); -+ aAddress.StartRow = aRange.aStart.Row(); -+ aAddress.EndRow = aRange.aEnd.Row(); ++ ScAddress::Details dDetails( ScAddress::CONV_XL_A1, 0, 0 ); ++ ScRange tmpRange; ++ tmpRange.ParseRows( sAddress, getDocumentFromRange( mxRange ), dDetails ); ++ nStartRow = tmpRange.aStart.Row(); ++ nEndRow = tmpRange.aEnd.Row(); ++ ++ aRange.aStart.SetRow( aRange.aStart.Row() + nStartRow ); ++ aRange.aEnd.SetRow( aRange.aStart.Row() + ( nEndRow - nStartRow )); ++ + } + else + throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Illegal param" ) ), uno::Reference< uno::XInterface >() ); -+ -+ return uno::Reference< vba::XRange >( new ScVbaRange( m_xContext, mxRange->getCellRangeByPosition( -+ aAddress.StartColumn, aAddress.StartRow, -+ aAddress.EndColumn, aAddress.EndRow ), true ) ); -+ } -+ // Questionable return, I'm just copying the invalid Any::value path -+ // above. Would seem to me that this is an internal error and -+ // warrants an exception thrown -+ return uno::Reference< vba::XRange >( new ScVbaRange( m_xContext, mxRange, true ) ); ++ ++ if ( aRange.aStart.Row() < 0 || aRange.aEnd.Row() < 0 ) ++ throw uno::RuntimeException( rtl::OUString::createFromAscii("Internal failure, illegal param"), uno::Reference< uno::XInterface >() ); ++ // return a normal range ( even for multi-selection ++ uno::Reference< table::XCellRange > xRange( new ScCellRangeObj( pUnoRangesBase->GetDocShell(), aRange ) ); ++ return new ScVbaRange( m_xContext, xRange ); ++ } ++ // Rows() - no params ++ return new ScVbaRange( m_xContext, mxRange, true ); +} + +uno::Reference< vba::XRange > -+ScVbaRange::Columns( const uno::Any& aIndex ) throw (uno::RuntimeException) ++ScVbaRange::Columns(const uno::Any& aIndex ) throw (uno::RuntimeException) +{ -+ // #TODO code within the test below "if ( m_Areas.... " can be removed -+ // Test is performed only because m_xRange is NOT set to be -+ // the first range in m_Areas ( to force failure while -+ // the implementations for each method are being updated ) -+ if ( m_Areas->getCount() > 1 ) -+ { -+ uno::Reference< vba::XRange > xRange( getArea( 0 ), uno::UNO_QUERY_THROW ); -+ return xRange->Columns( aIndex ); -+ } ++ SCCOL nStartCol = 0; ++ SCCOL nEndCol = 0; ++ ++ sal_Int32 nValue; ++ rtl::OUString sAddress; ++ + if ( aIndex.hasValue() ) + { -+ uno::Reference< vba::XRange > xRange; -+ sal_Int32 nValue; -+ rtl::OUString sAddress; -+ RangeHelper thisRange( mxRange ); -+ uno::Reference< sheet::XCellRangeAddressable > xThisRangeAddress = thisRange.getCellRangeAddressable(); -+ uno::Reference< table::XCellRange > xRanges = thisRange.getCellRangeFromSheet(); -+ table::CellRangeAddress thisRangeAddress = xThisRangeAddress->getRangeAddress(); -+ uno::Reference< table::XCellRange > xReferrer = xRanges->getCellRangeByPosition( thisRangeAddress.StartColumn, thisRangeAddress.StartRow, MAXCOL, thisRangeAddress.EndRow ); -+ -+ if ( aIndex >>= nValue ) -+ { -+ --nValue; -+ // col value can expand outside this range -+ // rows however cannot ++ ScCellRangesBase* pUnoRangesBase = getCellRangesBase(); ++ ScRangeList aCellRanges = pUnoRangesBase->GetRangeList(); + -+ thisRangeAddress.StartColumn = nValue; -+ thisRangeAddress.EndColumn = nValue; ++ ScRange aRange = *aCellRanges.First(); ++ if( aIndex >>= nValue ) ++ { ++ aRange.aStart.SetCol( aRange.aStart.Col() + --nValue ); ++ aRange.aEnd.SetCol( aRange.aStart.Col() ); + } -+ else if ( aIndex >>= sAddress ) ++ ++ else if ( aIndex >>= sAddress ) + { + ScAddress::Details dDetails( ScAddress::CONV_XL_A1, 0, 0 ); -+ ScRange aRange; -+ aRange.ParseCols( sAddress, getDocumentFromRange( mxRange ), dDetails ); -+ thisRangeAddress.StartColumn = aRange.aStart.Col(); -+ thisRangeAddress.EndColumn = aRange.aEnd.Col(); ++ ScRange tmpRange; ++ tmpRange.ParseCols( sAddress, getDocumentFromRange( mxRange ), dDetails ); ++ nStartCol = tmpRange.aStart.Col(); ++ nEndCol = tmpRange.aEnd.Col(); ++ ++ aRange.aStart.SetCol( aRange.aStart.Col() + nStartCol ); ++ aRange.aEnd.SetCol( aRange.aStart.Col() + ( nEndCol - nStartCol )); ++ + } + else + throw uno::RuntimeException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Illegal param" ) ), uno::Reference< uno::XInterface >() ); -+ return uno::Reference< vba::XRange >( new ScVbaRange( m_xContext, xReferrer->getCellRangeByPosition( thisRangeAddress.StartColumn, thisRangeAddress.StartRow, thisRangeAddress.EndColumn, thisRangeAddress.EndRow ), false, true ) ); ++ ++ if ( aRange.aStart.Col() < 0 || aRange.aEnd.Col() < 0 ) ++ throw uno::RuntimeException( rtl::OUString::createFromAscii("Internal failure, illegal param"), uno::Reference< uno::XInterface >() ); ++ // return a normal range ( even for multi-selection ++ uno::Reference< table::XCellRange > xRange( new ScCellRangeObj( pUnoRangesBase->GetDocShell(), aRange ) ); ++ return new ScVbaRange( m_xContext, xRange ); + } -+ // otherwise return this object ( e.g for columns property with no -+ // params -+ return uno::Reference< vba::XRange >( new ScVbaRange( m_xContext, mxRange, false, true ) ); -+} ++ // Columns() - no params ++ return new ScVbaRange( m_xContext, mxRange, true ); ++} + +void +ScVbaRange::setMergeCells( sal_Bool bIsMerged ) throw (uno::RuntimeException) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 perl-Bootloader
by root＠Hilbert.suse.de 03 Apr '07

03 Apr '07

Hello community, here is the log from the commit of package perl-Bootloader checked in at Tue Apr 3 20:49:21 CEST 2007. -------- --- perl-Bootloader/perl-Bootloader.changes 2007-03-26 19:07:40.000000000 +0200 +++ /mounts/work_src_done/STABLE/perl-Bootloader/perl-Bootloader.changes 2007-04-03 17:27:20.000000000 +0200 @@ -1,0 +2,40 @@ +Tue Apr 3 17:26:31 CEST 2007 - aosthof(a)suse.de + +- Cosmetic correction in Tools.pm + +------------------------------------------------------------------- +Tue Apr 3 16:36:29 CEST 2007 - aosthof(a)suse.de + +- Improved error handling in Tools.pm + +------------------------------------------------------------------- +Mon Apr 2 19:22:20 CEST 2007 - aosthof(a)suse.de + +- Fixed 'uname' call in Tools.pm due to return of false + architectures (e.g. i586 instead of i386) + +------------------------------------------------------------------- +Mon Apr 2 14:07:55 CEST 2007 - aosthof(a)suse.de + +- Fixed typo in GRUB.pm + +------------------------------------------------------------------- +Mon Apr 2 11:38:57 CEST 2007 - aosthof(a)suse.de + +- Added function GrubDev2MountPoint() to GRUB.pm to be able to + retrieve mountpoints of grub devices +- Fixed functions GrubDev2UnixDev(), UnixDev2GrubDev(), + GrubPath2UnixPath() and ParseLines() in GRUB.pm + +- Added wrapper for GrubDev2UnixDev() to Library.pm to be able to + call it from Tools.pm + +- Fixed functions ReadDMRaidPartitions(), IsDMRaidSlave(), + Udev2MajMin() and AddSection() in Tools.pm +- Commented out obsolete code in GetSectionList() and + RemoveSections() in Tools.pm + +- Fixed 'uname' call in update-bootloader due to return of false + architectures (e.g. i586 instead of i386) + +------------------------------------------------------------------- Old: ---- perl-Bootloader-0.4.13.tar.bz2 New: ---- perl-Bootloader-0.4.14.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Bootloader.spec ++++++ --- /var/tmp/diff_new_pack.je1381/_old 2007-04-03 20:43:20.000000000 +0200 +++ /var/tmp/diff_new_pack.je1381/_new 2007-04-03 20:43:20.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package perl-Bootloader (Version 0.4.13) +# spec file for package perl-Bootloader (Version 0.4.14) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,7 +11,7 @@ # norootforbuild Name: perl-Bootloader -Version: 0.4.13 +Version: 0.4.14 Release: 1 Requires: perl >= %{perl_version} Requires: perl-gettext @@ -63,6 +63,28 @@ /usr/lib/bootloader %changelog +* Tue Apr 03 2007 - aosthof(a)suse.de +- Cosmetic correction in Tools.pm +* Tue Apr 03 2007 - aosthof(a)suse.de +- Improved error handling in Tools.pm +* Mon Apr 02 2007 - aosthof(a)suse.de +- Fixed 'uname' call in Tools.pm due to return of false + architectures (e.g. i586 instead of i386) +* Mon Apr 02 2007 - aosthof(a)suse.de +- Fixed typo in GRUB.pm +* Mon Apr 02 2007 - aosthof(a)suse.de +- Added function GrubDev2MountPoint() to GRUB.pm to be able to + retrieve mountpoints of grub devices +- Fixed functions GrubDev2UnixDev(), UnixDev2GrubDev(), + GrubPath2UnixPath() and ParseLines() in GRUB.pm +- Added wrapper for GrubDev2UnixDev() to Library.pm to be able to + call it from Tools.pm +- Fixed functions ReadDMRaidPartitions(), IsDMRaidSlave(), + Udev2MajMin() and AddSection() in Tools.pm +- Commented out obsolete code in GetSectionList() and + RemoveSections() in Tools.pm +- Fixed 'uname' call in update-bootloader due to return of false + architectures (e.g. i586 instead of i386) * Mon Mar 26 2007 - aosthof(a)suse.de - Corrected mechanism for removal of sections in Tools.pm - part 2 * Mon Mar 26 2007 - aosthof(a)suse.de ++++++ perl-Bootloader-0.4.13.tar.bz2 -> perl-Bootloader-0.4.14.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/perl-Bootloader-0.4.13/lib/Bootloader/Core/GRUB.pm new/perl-Bootloader-0.4.14/lib/Bootloader/Core/GRUB.pm --- old/perl-Bootloader-0.4.13/lib/Bootloader/Core/GRUB.pm 2007-03-13 13:12:31.000000000 +0100 +++ new/perl-Bootloader-0.4.14/lib/Bootloader/Core/GRUB.pm 2007-04-02 14:08:36.000000000 +0200 @@ -64,6 +64,9 @@ C<< $opt_types_ref = BootGrub->GetOptTypes (); >> +C<< $mountpoint = Bootloader::Core::GRUB->GrubDev2MountPoint ($grub_dev); >> + + =head1 DESCRIPTION =over 2 @@ -387,36 +390,42 @@ $self->l_debug ("GRUB::GrubDev2UnixDev: Not translating device $dev"); return $dev; } + my $original = $dev; my $partition = undef; - if ($dev =~ /$([^,]+),([^,]+)$/) - { + + # Check if $dev consists of something like (hd0,0), thus a grub device + if ($dev =~ /$([^,]+),([^,]+)$/) { $dev = $1; $partition = $2 + 1; } - elsif ($dev =~ /$([^,]+)$/) - { + elsif ($dev =~ /$([^,]+)$/) { $dev = $1; } - # $dev = UnixDevName($dev) - while ((my $unix, my $fw) = each (%{$self->{"device_map"}})) - { + + while ((my $unix, my $fw) = each (%{$self->{"device_map"}})) { if ($dev eq $fw) { $dev = $unix; } } - if (defined ($partition)) - { - foreach my $dev_ref (@{$self->{"partitions"}}) - { - if ($dev_ref->[1] eq $dev && $dev_ref->[2] == $partition) - { + + # resolve symlinks..... + my $cmd = "udevinfo -q name -n $dev"; + if (my $resolved_link = qx{$cmd 2> /dev/null}) { + chomp ($resolved_link); + $dev = "/dev/" . $resolved_link; + } + + if (defined ($partition)) { + foreach my $dev_ref (@{$self->{"partitions"}}) { + if ($dev_ref->[1] eq $dev && $dev_ref->[2] == $partition) { $dev = $dev_ref->[0]; $self->l_debug ("GRUB::GrubDev2UnixDev: Translated $original to $dev"); return $dev; } } } + $dev = $self->Member2MD ($dev); $self->l_debug ("GRUB::GrubDev2UnixDev: Translated GRUB->UNIX: $original to $dev"); return $dev; @@ -439,33 +448,60 @@ $self->l_debug ("GRUB::UnixDev2GrubDev: Empty device to translate"); return $dev; } - if ($dev =~ /^$.*$$/) { # seems to be a grub device already + # Seems to be a grub device already + if ($dev =~ /^$.*$$/) { $self->l_debug ("GRUB::UnixDev2GrubDev: Not translating device $dev"); return $dev; } + + # This gives me the devicename, wether $dev is the device or a link! + # This works for udev (kernel) devices only, devicemapper doesn't + # need to be changed here my $original = $dev; + my $kernel_dev; + my $cmd = "udevinfo -q name -n $dev"; + if ($kernel_dev = qx{$cmd 2> /dev/null}) { + chomp $kernel_dev; + $kernel_dev = "/dev/" . $kernel_dev; + } + else { + $kernel_dev = $dev; + } + my $partition = undef; - if ($dev =~ m:/dev/md\d+:) { + if ($dev =~ m#/dev/md\d+#) { my @members = @{$self->MD2Members ($dev) || []}; # FIXME! This only works for mirroring (Raid1) $dev = $members[0] || $dev; } - # check for symbolic links as they are used for dev-by-id and such - if ( -l $dev) { - $dev = sprintf("%s/%s", $dev=~m:^(.+)/[^/]*$:, readlink($dev)); - $dev = $self->CanonicalPath($dev); - } - foreach my $dev_ref (@{$self->{"partitions"}}) - { - if ($dev_ref->[0] eq $dev) - { - $dev = $dev_ref->[1]; + + # fetch the underlying device (sda1 --> sda) + foreach my $dev_ref (@{$self->{"partitions"}}) { + if ($dev_ref->[0] eq $kernel_dev) { + $kernel_dev = $dev_ref->[1]; $partition = $dev_ref->[2] - 1; + last; } } - if ( exists $self->{"device_map"}->{$dev} ) { - $dev = $self->{"device_map"}->{$dev}; + # get the symbolic link from udev, it might be used in device.map + # udevinfo returns a space separated list of strings + $cmd = "udevinfo -q symlink -n $kernel_dev"; + + my @udev_links = split (/ /, qx{$cmd 2>/dev/null}); + + # now check kernel devices / devicemapper devices + if ( exists $self->{"device_map"}->{$kernel_dev} ) { + $dev = $self->{"device_map"}->{$kernel_dev}; + } + else { + foreach my $udev_link (@udev_links) { + chomp ($udev_link); + $udev_link = "/dev/" . $udev_link; + if (exists $self->{"device_map"}->{$udev_link} ) { + $dev = $self->{"device_map"}->{$udev_link}; + } + } } $dev = defined ($partition) @@ -493,35 +529,41 @@ my $dev = shift; my $orig_path = $path; - if ($path =~ /^($.+$)(.+)$/) - { + if ($path =~ /^($.+$)(.+)$/) { $dev = $1; $path = $2; } - else - { + else { $orig_path = $dev . $path; } - if ($dev eq "") - { + if ($dev eq "") { $self->l_warning ("GRUB::GrubPath2UnixPath: Path $orig_path in UNIX form, not modifying it"); return $orig_path; } - $dev = $self->GrubDev2UnixDev ($dev); - $dev = $self->Member2MD ($dev); + #FIXME: sf@ need to check for udev links here as well + #$dev = $self->GrubDev2UnixDev ($dev); + #$dev = $self->Member2MD ($dev); - my $mountpoint = $dev; - while ((my $mp, my $d) = each (%{$self->{"mountpoints"}})) - { - if ($d eq $dev) - { + my $mountpoint; + if ($dev) { + $mountpoint = $self->GrubDev2MountPoint($dev) + } + else { + $mountpoint = $dev; + } + +=cut + while ((my $mp, my $d) = each (%{$self->{"mountpoints"}})) { + if ($d eq $dev) { $mountpoint = $mp; } } - if ($mountpoint eq $dev) # no mount point found - { +=cut + + # no mount point found + if ($mountpoint eq $dev) { $self->l_milestone ("GRUB::GrubPath2UnixPath: Device $dev does not have mount point, keeping GRUB path $orig_path"); return $orig_path; } @@ -550,8 +592,7 @@ my $orig_path = shift; my $preset_dev = shift; - if ($orig_path =~ /^$.+$.+$/) - { + if ($orig_path =~ /^$.+$.+$/) { $self->l_milestone ("GRUB::UnixPath2GrubPath: Path $orig_path in GRUB form, keeping it"); return $orig_path; } @@ -559,10 +600,10 @@ (my $dev, my $path) = $self->SplitDevPath ($orig_path); $dev = $self->UnixDev2GrubDev ($dev); - if ($dev eq $preset_dev) - { + if ($dev eq $preset_dev) { $dev = ""; } + $path = $dev . $path; $self->l_debug ("GRUB::UnixPath2GrubPath: Translated path: $orig_path, prefix $preset_dev, to: $path"); return $path; @@ -754,7 +795,7 @@ my ($boot_dev,) = $self->SplitDevPath ("/boot"); my ($root_dev,) = $self->SplitDevPath ("/"); # mbr_dev is the first bios device - my $mbr_dev = $self->GrubDev2UnixDev("hd0"); + my $mbr_dev = $self->GrubDev2UnixDev("(hd0)"); foreach my $dev (@devices) { $self->l_milestone ("GRUB::Parselines: checking boot device $dev"); @@ -854,7 +895,7 @@ if (defined $flag and $flag eq "true") { # if /boot mountpoint exists add($disk(/boot) else add disk(/) # mbr_dev is the first bios device - $dev = $self->GrubDev2UnixDev("hd0"); + $dev = $self->GrubDev2UnixDev("(hd0)"); $s1_devices{$dev} = 1 if defined $dev; } @@ -1750,6 +1791,48 @@ return $ret == 0; } +=item +C<< $mountpoint = Bootloader::Core::GRUB->GrubDev2MountPoint (); >> + +creates the mountpoint from a Grub Device (hdX,Y), be it +a udev device, a udev link or a device mapper device + +returns the mountpoint or the grub device, if it couldn't be resolved + +=cut + +sub GrubDev2MountPoint { + my $self = shift; + my $grub_dev = shift; + my @devices = (); + my $device = $self->GrubDev2UnixDev($grub_dev); + + push (@devices, $device); + + #FIXME: sf@ need handling for /dev/dm-X devices here + if ($device !~ /mapper/) { + my $cmd = "udevinfo -q symlink -n $device"; + my @udev_links = split (/ /, qx{$cmd 2>/dev/null}); + + foreach $device (@udev_links) { + chomp $device; + $device = "/dev/" . $device; + push (@devices, $device); + } + } + + my $mountpoint = $grub_dev; + foreach $device (@devices) { + while ((my $mp, my $d) = each (%{$self->{"mountpoints"}})) { + if ($d eq $device) { + $mountpoint = $mp; + } + } + } + + return $mountpoint; +} + 1; # diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/perl-Bootloader-0.4.13/lib/Bootloader/Library.pm new/perl-Bootloader-0.4.14/lib/Bootloader/Library.pm --- old/perl-Bootloader-0.4.13/lib/Bootloader/Library.pm 2007-03-13 13:12:31.000000000 +0100 +++ new/perl-Bootloader-0.4.14/lib/Bootloader/Library.pm 2007-04-02 12:59:58.000000000 +0200 @@ -65,6 +65,8 @@ C<< $grub_dev = Bootloader::Library->UnixFile2GrubDev ($unix_file); >> +C<< $unix_dev = Bootloader::Library->GrubDev2UnixDev ($grub_dev); >> + =head1 DESCRIPTION =over 2 @@ -844,6 +846,26 @@ return $grub_dev; } +=item +C<< $unix_dev = Bootloader::Core::GRUB->GrubDev2UnixDev ($grub_dev); >> + +Translates the GRUB device (eg. '(hd0,0)') to UNIX device (eg. '/dev/hda1'). +As argument takes the GRUB device, returns the UNIX device (both strings). +Wrapper function to be able to use this grub function in Tools.pm. + +=cut + +# string GrubDev2UnixDev (string grub_dev) +sub GrubDev2UnixDev { + my $self = shift; + my $grub_dev = shift; + my $loader = $self->{loader} || return undef; + + my $unix_dev = $loader->GrubDev2UnixDev ($grub_dev); + + return $unix_dev; +} + 1; # diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/perl-Bootloader-0.4.13/lib/Bootloader/Tools.pm new/perl-Bootloader-0.4.14/lib/Bootloader/Tools.pm --- old/perl-Bootloader-0.4.13/lib/Bootloader/Tools.pm 2007-03-26 19:07:40.000000000 +0200 +++ new/perl-Bootloader-0.4.14/lib/Bootloader/Tools.pm 2007-04-03 17:27:20.000000000 +0200 @@ -72,6 +72,8 @@ C<< Bootloader::Tools::RemoveSections($name); >> +C<< $exec_with_path = Bootloader::Tools::AddPathToExecutable($executable); >> + =head1 DESCRIPTION =over 2 @@ -95,6 +97,7 @@ use Bootloader::Core; my $lib_ref = undef; +my $dmsetup = undef; sub DumpLog { foreach my $rec (@{$lib_ref->GetLogRecords ()}) @@ -103,11 +106,11 @@ my $level = $rec->{"level"}; if ($level eq "debug") { -# print STDERR ("DEBUG: $message\n"); + #print STDERR ("DEBUG: $message\n"); } elsif ($level eq "milestone") { -# print STDERR ("MILESTONE: $message\n"); + #print STDERR ("MILESTONE: $message\n"); } elsif ($level eq "warning") { @@ -144,7 +147,9 @@ =cut sub ReadMountPoints { - open (FILE, "/etc/fstab") || die ("Failed to open /etc/fstab"); + open (FILE, "/etc/fstab") || + die ("ReadMountPoints(): Failed to open /etc/fstab"); + my %mountpoints = (); while (my $line = <FILE>) { @@ -156,7 +161,9 @@ { if ($dev =~ m/^LABEL=/ || $dev =~ m/UUID=/) { - open (BLKID, "/sbin/blkid -t $dev |") || die ("Failed to run blkid"); + open (BLKID, "/sbin/blkid -t $dev |") || + die ("ReadMountPoints(): Failed to run blkid"); + my $line = <BLKID>; close (BLKID); chomp ($line); @@ -200,7 +207,9 @@ # FIXME: this has to be read through yast::storage sub ReadPartitions { my $sb="/sys/block"; - opendir(BLOCK_DEVICES, "$sb") || die ("Failed to open dir $sb"); + opendir(BLOCK_DEVICES, "$sb") || + die ("ReadPartitions(): Failed to open dir $sb"); + my @disks = grep { !m/^\./ and -r "$sb/$_/range" and qx{ cat $sb/$_/range } > 1 } readdir(BLOCK_DEVICES); @@ -219,7 +228,7 @@ my $dev_disk = Udev2Dev ($disk); if (!IsDMDevice($disk) && !IsDMRaidSlave($disk)){ opendir(BLOCK_DEVICES, "$sb/$disk") || - die ("Failed to open dir $sb/$disk"); + die ("ReadPartitions(): Failed to open dir $sb/$disk"); my @parts = grep { !m/^\./ and -d "$sb/$disk/$_" and -f "$sb/$disk/$_/dev" @@ -250,14 +259,25 @@ =cut -sub DMRaidAvailable (){ - my $dm_devices = qx{dmsetup info -c --noheadings -o uuid}; - chomp($dm_devices); +sub DMRaidAvailable { + my $retval = 1; + + $dmsetup = AddPathToExecutable("dmsetup"); - if ("$dm_devices" eq "No devices found"){ - return 0; + if (-e $dmsetup) { + my $dm_devices = qx{$dmsetup info -c --noheadings -o uuid}; + chomp($dm_devices); + + if ($dm_devices eq "No devices found") { + $retval = 0; + } + } + else { + print ("The command \"dmsetup\" is not available.\n"); + print ("Is the package \"device-mapper\" installed?\n"); } - return 1; + + return $retval; } =item @@ -276,46 +296,51 @@ =cut #FIXME: this has to be done through Storage -sub ReadDMRaidPartitions() { +sub ReadDMRaidPartitions { my @dmdisks = (); my @dmparts = (); my $dmdev; - open(DMDEV, "dmsetup info -c --noheadings -o name |") || die ("FOOBAR"); + open(DMDEV, "$dmsetup info -c --noheadings -o name |") || + die ("ReadDMRaidPartitions(): dmsetup failed."); + + while (<DMDEV>) { + $dmdev = $_; + chomp($dmdev); + + #FIXME: I should not need to do this twice + if ($dmdev !~ m/part/) { + # $dmdev is the base device + $dmdev = "/dev/mapper/" . $dmdev; + push @dmdisks, $dmdev; + } + #FIXME: need to check what needs to be removed + else { + $dmdev = "/dev/mapper/" . $dmdev; + push @dmparts, $dmdev; + } + } + close DMDEV; + + my @devices = (); + my $dmpart; + my $tmp_part; + + foreach $dmdev (@dmdisks) { + foreach $dmpart (@dmparts) { + if ($dmpart =~ m/$dmdev/) { + my $index = substr ($dmpart, length($dmpart)-2,2); + + while (length ($index) > 0 && substr ($index, 0, 1) !~ /[0-9]/) { + $index = substr ($index, 1); + } + push @devices, [$dmpart, $dmdev, $index]; + } + } + } - while(<DMDEV>){ - $dmdev = $_; - chomp($dmdev); - - #FIXME: I should not need to do this twice - if ($dmdev !~ m/part/){ - # $dmdev is the base device - $dmdev = "/dev/mapper/" . $dmdev; - push @dmdisks, $dmdev; - } - else{ #FIXME: need to check what needs to be removed - $dmdev = "/dev/mapper/" . $dmdev; - push @dmparts, $dmdev; - } - } - close DMDEV; - my @devices = (); - my $dmpart; - my $tmp_part; - - foreach $dmdev (@dmdisks){ - foreach $dmpart (@dmparts){ - my $index = substr ($dmpart, length($dmpart)-1,1); - - while (length ($index) > 0 && substr ($index, 0, 1) !~ /[0-9]/) - { - $index = substr ($index, 1); - } - push @devices, [$dmpart, $dmdev, $index]; - } - } return \@devices; } @@ -326,14 +351,15 @@ =cut -sub ReadDMRaidDisks(){ +sub ReadDMRaidDisks { my @dmdisks = (); my @dmparts = (); my $dmdev; - open(DMDEV, "dmsetup info -c --noheadings -oname |") || die ("FOOBAR"); + open(DMDEV, "$dmsetup info -c --noheadings -oname |") || + die ("ReadDMRaidDisks(): dmsetup failed."); while(<DMDEV>){ $dmdev = $_; @@ -356,23 +382,26 @@ =cut -sub IsDMRaidSlave(){ +sub IsDMRaidSlave { my $disk = shift; my $majmin_disk = Udev2MajMin($disk); + chomp($majmin_disk); my @dmparts = (); - my @dm_devs = qx{dmsetup info -c --noheadings -o name | grep -v part}; + my @dm_devs = qx{$dmsetup info -c --noheadings -o name | grep -v part}; - if ($dm_devs[0] !~ /No devices found/){ - foreach my $dmdisk (@dm_devs){ - my @tables = qx{dmsetup table $dmdisk}; + if ($dm_devs[0] !~ /No devices found/) { + foreach my $dmdisk (@dm_devs) { + my @tables = qx{$dmsetup table $dmdisk}; - foreach my $line (@tables){ + foreach my $line (@tables) { my @content = split(/ /, $line); foreach my $majmins (@content){ - if ("$majmins" eq "$majmin_disk"){ - return 1; + if ($majmins =~ m/(\d+):(\d+)/) { + if ("$majmins" eq "$majmin_disk") { + return 1; + } } } } @@ -390,10 +419,10 @@ otherwise 0. =cut -sub IsDMDevice(){ +sub IsDMDevice { my $dev = shift; - my $cmd = "dmsetup info -c --noheadings -oname $dev"; + my $cmd = "$dmsetup info -c --noheadings -oname $dev"; if (my $test = qx{$cmd 2>/dev/null}){ chomp $test; @@ -412,7 +441,7 @@ =cut -sub Bootloader::Tools::Udev2DMDev(){ +sub Bootloader::Tools::Udev2DMDev { my $udevd = shift; my $majmin = Udev2MajMin($udevd); @@ -429,7 +458,7 @@ =cut -sub Bootloader::Tools::DMDev2Udev(){ +sub Bootloader::Tools::DMDev2Udev { my $dmdev = shift; my $majmin = DMDev2MajMin($dmdev); @@ -446,11 +475,11 @@ =cut -sub Bootloader::Tools::DMDev2MajMin(){ +sub Bootloader::Tools::DMDev2MajMin { my $dmdev = shift; my $majmin; - $majmin = qx{dmsetup info -c --noheadings -o major,minor $dmdev}; + $majmin = qx{$dmsetup info -c --noheadings -o major,minor $dmdev}; return $majmin; } @@ -463,7 +492,7 @@ =cut -sub Bootloader::Tools::Udev2MajMin(){ +sub Bootloader::Tools::Udev2MajMin { my $udev_dev = shift; my $majmin; @@ -473,6 +502,7 @@ chomp ($udev_path); $majmin = qx{cat /sys$udev_path/dev}; } + chomp ($majmin); return $majmin; } @@ -484,48 +514,49 @@ =cut -sub Bootloader::Tools::MajMin2Udev(){ +sub Bootloader::Tools::MajMin2Udev { -my $majmin = shift; + my $majmin = shift; -my ($major, $minor) = split (/:/, $majmin ); -my $udevdev; -my $sb="/sys/block"; -my $devmajmin; -#print ("Major: $major; Minor: $minor\n"); -opendir (SYSBLOCK, "$sb"); - -foreach my $dirent (readdir(SYSBLOCK)){ - next if $dirent =~ m/^\./; - next if -r "$sb/$dirent/range" and qx{ cat $sb/$dirent/range } == 1; - $devmajmin = qx{cat $sb/$dirent/dev}; - my ($p, undef) = (split(/:/, $devmajmin)); - - if ("$p" eq "$major" ){ - $udevdev = "$sb/$dirent"; - last; - } -} -closedir (SYSBLOCK); -opendir (SYSBLOCK, "$udevdev"); -my $part; - -foreach my $dirent (readdir(SYSBLOCK)){ - next if $dirent =~ m/^\./; - - if (-r "$udevdev/$dirent/dev"){ - my $mm = qx{cat $udevdev/$dirent/dev}; - chomp ($mm); - - if ("$mm" eq "$majmin"){ - $part = $dirent; - last; - } + my ($major, $minor) = split (/:/, $majmin ); + my $udevdev; + my $sb="/sys/block"; + my $devmajmin; + + opendir (SYSBLOCK, "$sb"); + + foreach my $dirent (readdir(SYSBLOCK)) { + next if $dirent =~ m/^\./; + next if -r "$sb/$dirent/range" and qx{ cat $sb/$dirent/range } == 1; + $devmajmin = qx{cat $sb/$dirent/dev}; + my ($p, undef) = (split(/:/, $devmajmin)); + + if ("$p" eq "$major" ) { + $udevdev = "$sb/$dirent"; + last; + } } -} -closedir (SYSBLOCK); -return $part; + closedir (SYSBLOCK); + + opendir (SYSBLOCK, "$udevdev"); + my $part; + + foreach my $dirent (readdir(SYSBLOCK)) { + next if $dirent =~ m/^\./; + + if (-r "$udevdev/$dirent/dev") { + my $mm = qx{cat $udevdev/$dirent/dev}; + chomp ($mm); + + if ("$mm" eq "$majmin") { + $part = $dirent; + last; + } + } + } + closedir (SYSBLOCK); + return $part; } =item @@ -536,7 +567,7 @@ =cut -sub Bootloader::Tools::MajMin2DMDev(){ +sub Bootloader::Tools::MajMin2DMDev { my $majmin = shift; my $dm_name = qx{devmap_name $majmin}; @@ -569,7 +600,8 @@ my @members = (); open (MD, "/sbin/mdadm --detail --verbose --scan |") || - die ("Failed getting information about MD arrays"); + die ("ReadRAID1Arrays(): Failed getting information about MD arrays"); + my ($array, $level, $num_devices); while (my $line = <MD>) { @@ -583,11 +615,11 @@ { # we could test $num_device against number of found devices to # detect degradedmode but that does not matter here (really?) - $mapping{$array} = [ split(/,/, $1) ]; } } close( MD ); + return \%mapping; } @@ -604,7 +636,7 @@ # FIXME: this has to be read through yast::storage or such sub GetBootloader { my $lt = qx{ . /etc/sysconfig/bootloader && echo \$LOADER_TYPE } or - die "Cannot determine the loader type"; + die ("GetBootloader(): Cannot determine the loader type"); chomp ($lt); return $lt; } @@ -642,6 +674,8 @@ foreach my $opt (keys %{$opt_ref}) { next unless exists $sect_ref->{"$opt"}; # FIXME: avoid "kernel" + # FIXME: if opt_ref doesn't have (hdX,Y), there is a mountpoint, thus remove it from sect_ref + # FIXME: to compare !! if ($opt eq "image" or $opt eq "kernel" or $opt eq "initrd") { $match = (ResolveCrossDeviceSymlinks($sect_ref->{"$opt"}) eq $opt_ref->{"$opt"}); @@ -734,9 +768,8 @@ sub GetSystemLanguage { - - open (FILE, ". /etc/sysconfig/language && echo \$RC_LANG |") - || die "Cannot determine the system language"; + open (FILE, ". /etc/sysconfig/language && echo \$RC_LANG |") || + die ("GetSystemLanguage(): Cannot determine the system language"); my $lang = <FILE>; close (FILE); @@ -761,7 +794,7 @@ if (! defined ($glob_ref)) { - die "Getting global data failed"; + die ("GetDefaultSection(): Getting global data failed"); } # This doesn't return the index of the default section, but the title of it. @@ -773,7 +806,7 @@ if (! defined ($section_ref)) { - die "Getting sections failed"; + die ("GetDefaultSection(): Getting sections failed"); } # get the hash of the default section, identified by key 'name' @@ -800,7 +833,7 @@ my $ref = GetDefaultSection(); # FIXME: all modules under .../Core should use "image" as a key tag to the # kernel image - return $ref->{"image"} || $ref->{"kernel"}; + return $ref->{"image"} || $ref->{"kernel"}; } =item @@ -869,6 +902,7 @@ # - still needed, but this shouldn't happen. # Examines if image and initrd strings already contain a grub device # prefix. If it is not the case, attach it. +=cut if ($loader eq "grub") { foreach my $key (sort keys %option) { unless ($option{$key} =~ /^$hd\d+,\d+$.*$/) { @@ -889,6 +923,7 @@ } } } +=cut normalize_options(\%option); my @sections = @{$lib_ref->GetSections ()}; @@ -907,7 +942,7 @@ # FIXME: Add documentation =cut -sub GetSection($) { +sub GetSection { my $name = shift or return undef; foreach (@{$lib_ref->GetSections ()}) { @@ -948,23 +983,22 @@ my %new = ( "root" => $mp->{"/"} || "/dev/null", ); - + # FIXME: sf@: what is this code good for? + # FIXME: removed resetting root parameter if it's already set my %def = (); - foreach my $s (@sections) - { - if (defined ($s->{"initial"}) && $s->{"initial"}) - { + foreach my $s (@sections) { + if (defined ($s->{"initial"}) && $s->{"initial"}) { %def = %{$s}; last; } } - while ((my $k, my $v) = each (%def)) - { + while ((my $k, my $v) = each (%def)) { if (substr ($k, 0, 2) ne "__" && $k ne "original_name" - && $k ne "initrd") - { - $new{$k} = $v; + && $k ne "initrd") { + if (!defined $new{$k}) { + $new{$k} = $v; + } } } @@ -986,7 +1020,7 @@ # FIXME: Failsafe parameters should be set dynamically in the future if ($name =~ m/^Failsafe.*$/) { - my $arch = `uname --machine`; + my $arch = `uname --hardware-platform`; chomp ($arch); if ($arch eq "i386") { @@ -1040,18 +1074,42 @@ # Put new entries on top unshift @sections, \%new; + my $mp_ref = ReadMountPoints (); + my $root_mp = ''; + my $boot_mp = ''; + my $valid_part = 0; + + while ((my $k, my $v) = each (%$mp_ref)) { + $root_mp = $v if ($k eq "/"); + $boot_mp = $v if ($k eq "/boot"); + } + # Resolve kernel symlinks (if available) to full names my $link_target = ''; foreach my $s (@sections) { while ((my $k, my $v) = each (%$s)) { - if ($k eq "kernel" || $k eq "image" || $k eq "initrd") { - $v =~ s/^$.*$//; + if ($k eq "initrd" || $k eq "image" || $k eq "kernel") { + + if (($v =~ s#\/.*$##) && $v ne '') { + my $unix_dev = $lib_ref->GrubDev2UnixDev($v); + + if ($unix_dev eq $root_mp || $unix_dev eq $boot_mp) { + $valid_part = 1; + } + else { + $valid_part = 0; + } + } + } + + if (($k eq "kernel" || $k eq "image" || $k eq "initrd") && $valid_part) { if ($link_target = readlink ($v)) { chomp ($link_target); $s->{$k} = "/boot/" . $link_target; } } - if ($k eq "__lines") { + + if (($k eq "__lines") && $valid_part) { my $index = 0; foreach my $elem (@$v) { while ((my $k, my $v) = each (%$elem)) { @@ -1116,6 +1174,7 @@ $glob_ref->{"__modified"} = 1; $lib_ref->SetGlobalSettings ($glob_ref); } + # If a non default entry is updated, the index of the current # default entry has to be increased, because it is shifted down in the # array of sections. Only do this for grub. @@ -1177,9 +1236,11 @@ my $loader = GetBootloader (); # Examines if image and initrd strings already contain a grub device # prefix. If it is not the case, attach it. +=cut if ($loader eq "grub") { foreach my $key (sort keys %option) { unless ($option{$key} =~ /^$hd\d+,\d+$.*$/) { + print ("(hdx,y) not detected, key = $key,\tval = $option{$key}\n"); # In case /boot is resided on an own partition, the function # UnixPath2GrubPath (in GRUB.pm) doesn't substitute "/boot" # with the corresponding grub device, but keeps it. @@ -1189,6 +1250,7 @@ # match sections to be deleted, a grub device prefix must not # be attached to the given @option elements. if ($lib_ref->UnixFile2GrubDev ("/boot") eq $lib_ref->UnixFile2GrubDev ("/")){ + print("equal\n"); if ($key eq "image" || $key eq "initrd" || $key eq "kernel") { my $grub_dev = $lib_ref->UnixFile2GrubDev ("/boot"); $option{$key} = $grub_dev . $option{$key}; @@ -1197,6 +1259,7 @@ } } } +=cut normalize_options(\%option); @sections = grep { @@ -1221,6 +1284,38 @@ } +=item +C<< Bootloader::Tools::AddPathToExecutable ($executable); >> + +Prepends the corresponding (absolute) path to the given executable and returns +the result. If not found in path, function returns undef. + +EXAMPLE: + + my $executable = "dmsetup"; + + my $exec_with_path = Bootloader::Tools::AddPathToExecutable ($executable); + + if (-e $exec_with_path) { + print ("The desired executable is located here: $exec_with_path"); + } + +=cut + +sub AddPathToExecutable { + my $executable = shift; + my $retval = undef; + + foreach my $dir ( split(/:/, $ENV{PATH})) { + # Check if executable exists in current path + if (-x "$dir/$executable") { + $retval = "$dir/$executable"; + last; + } + } + + return $retval; +} 1; ++++++ update-bootloader ++++++ --- perl-Bootloader/update-bootloader 2007-03-23 19:26:31.000000000 +0100 +++ /mounts/work_src_done/STABLE/perl-Bootloader/update-bootloader 2007-04-02 12:59:58.000000000 +0200 @@ -319,7 +319,7 @@ AddSection($opt_name, @params); } - my $arch = `uname --machine`; + my $arch = `uname --hardware-platform`; chomp ($arch); # Add a "Failsafe" section ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-printer
by root＠Hilbert.suse.de 03 Apr '07

03 Apr '07

Hello community, here is the log from the commit of package yast2-printer checked in at Tue Apr 3 20:43:05 CEST 2007. -------- --- yast2-printer/yast2-printer.changes 2007-02-21 15:35:17.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-printer/yast2-printer.changes 2007-04-03 16:20:58.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Apr 3 14:49:15 CEST 2007 - mzugec(a)suse.cz + +- L3: autoyast fails on printer configuration (#258738) +- 2.14.23 + +------------------------------------------------------------------- Old: ---- yast2-printer-2.14.22.tar.bz2 New: ---- yast2-printer-2.14.23.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-printer.spec ++++++ --- /var/tmp/diff_new_pack.J30193/_old 2007-04-03 20:40:47.000000000 +0200 +++ /var/tmp/diff_new_pack.J30193/_new 2007-04-03 20:40:47.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-printer (Version 2.14.22) +# spec file for package yast2-printer (Version 2.14.23) # # 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-printer -Version: 2.14.22 +Version: 2.14.23 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-printer-2.14.22.tar.bz2 +Source0: yast2-printer-2.14.23.tar.bz2 prefix: /usr BuildRequires: blocxx-devel cups-devel cups-drivers cups-drivers-stp docbook-xsl-stylesheets doxygen gcc-c++ libxcrypt-devel libxslt openssl-devel perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-testsuite zlib-devel Requires: yast2 netcat zlib blocxx @@ -34,7 +34,7 @@ %prep -%setup -n yast2-printer-2.14.22 +%setup -n yast2-printer-2.14.23 %build %{prefix}/bin/y2tool y2autoconf @@ -106,6 +106,9 @@ %doc %{prefix}/share/doc/packages/yast2-printer %changelog +* Tue Apr 03 2007 - mzugec(a)suse.cz +- L3: autoyast fails on printer configuration (#258738) +- 2.14.23 * Wed Feb 21 2007 - mzugec(a)suse.cz - allow "localhost" and "127.0.0.1" as servername (#247273) - 2.14.22 ++++++ yast2-printer-2.14.22.tar.bz2 -> yast2-printer-2.14.23.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.14.22/configure new/yast2-printer-2.14.23/configure --- old/yast2-printer-2.14.22/configure 2007-02-21 15:34:25.000000000 +0100 +++ new/yast2-printer-2.14.23/configure 2007-04-03 14:50:20.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-printer 2.14.21. +# Generated by GNU Autoconf 2.60 for yast2-printer 2.14.23. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -713,8 +713,8 @@ # Identity of this package. PACKAGE_NAME='yast2-printer' PACKAGE_TARNAME='yast2-printer' -PACKAGE_VERSION='2.14.21' -PACKAGE_STRING='yast2-printer 2.14.21' +PACKAGE_VERSION='2.14.23' +PACKAGE_STRING='yast2-printer 2.14.23' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1431,7 +1431,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-printer 2.14.21 to adapt to many kinds of systems. +\`configure' configures yast2-printer 2.14.23 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1502,7 +1502,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-printer 2.14.21:";; + short | recursive ) echo "Configuration of yast2-printer 2.14.23:";; esac cat <<\_ACEOF @@ -1607,7 +1607,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-printer configure 2.14.21 +yast2-printer configure 2.14.23 generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1621,7 +1621,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-printer $as_me 2.14.21, which was +It was created by yast2-printer $as_me 2.14.23, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -2422,7 +2422,7 @@ # Define the identity of the package. PACKAGE='yast2-printer' - VERSION='2.14.21' + VERSION='2.14.23' cat >>confdefs.h <<_ACEOF @@ -2649,7 +2649,7 @@ -VERSION="2.14.21" +VERSION="2.14.23" RPMNAME="yast2-printer" MAINTAINER="Michal Zugec <mzugec(a)suse.cz>" @@ -23268,7 +23268,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-printer $as_me 2.14.21, which was +This file was extended by yast2-printer $as_me 2.14.23, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -23321,7 +23321,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-printer config.status 2.14.21 +yast2-printer config.status 2.14.23 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-printer-2.14.22/configure.in new/yast2-printer-2.14.23/configure.in --- old/yast2-printer-2.14.22/configure.in 2007-02-21 15:34:14.000000000 +0100 +++ new/yast2-printer-2.14.23/configure.in 2007-04-03 14:50:09.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-printer, 2.14.21, http://bugs.opensuse.org/, yast2-printer) +AC_INIT(yast2-printer, 2.14.23, http://bugs.opensuse.org/, yast2-printer) 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.14.21" +VERSION="2.14.23" RPMNAME="yast2-printer" MAINTAINER="Michal Zugec <mzugec(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.14.22/src/modules/Printer.ycp new/yast2-printer-2.14.23/src/modules/Printer.ycp --- old/yast2-printer-2.14.22/src/modules/Printer.ycp 2007-02-20 10:46:51.000000000 +0100 +++ new/yast2-printer-2.14.23/src/modules/Printer.ycp 2007-04-03 15:24:40.000000000 +0200 @@ -12,7 +12,7 @@ * Petr Blahos <pblahos(a)suse.cz> * Jiri Srain <jsrain(a)suse.cz> * - * $Id: Printer.ycp 36294 2007-02-20 09:44:46Z mzugec $ + * $Id: Printer.ycp 37287 2007-04-03 13:21:26Z mzugec $ * * Well we all know what modules are for. */ @@ -1567,9 +1567,9 @@ y2error("Cannot remove backup of /etc/cups/cupsd.conf"); } - Progress::NextStage (); // adjst services - if (testAbort ()) return false; -// ret = Spooler::AdjustServices (size (printcap) > 0) && ret; + Progress::NextStage (); + // adjst services + if (Spooler::AdjustServices (size (printcap) > 0)) return false; if (with_daemon) { Progress::NextStage (); // delete old printers diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.14.22/testsuite/tests/cupsWrite.out new/yast2-printer-2.14.23/testsuite/tests/cupsWrite.out --- old/yast2-printer-2.14.22/testsuite/tests/cupsWrite.out 2006-12-11 13:17:34.000000000 +0100 +++ new/yast2-printer-2.14.23/testsuite/tests/cupsWrite.out 2007-04-03 15:22:18.000000000 +0200 @@ -10,17 +10,11 @@ Write .etc.cups.cupsd_conf nil true Execute .target.bash_output "diff /etc/cups/cupsd.conf /etc/cups/cupsd.conf.old|grep -c ''" $["exit":0, "srderr":"", "stdout":""] Execute .target.bash "rm /etc/cups/cupsd.conf.old" 0 -Write .cups.default_dest "" true -Write .target.ycp "/var/lib/YaST2/printers" $["cups_usb_devices":`always, "drivers_were_installed":nil, "printers":[], "version":523] true -Execute .target.bash "/bin/chmod 600 /var/lib/YaST2/printers" 0 Execute .target.bash "test -f /etc/init.d/lpd && /etc/init.d/lpd stop" 0 Execute .target.bash "test -f /etc/init.d/cups && /etc/init.d/cups stop" 0 -Execute .target.bash "test -f /etc/init.d/cups && /etc/init.d/cups start" 0 -Execute .target.bash_output "/usr/bin/lpstat -v | /bin/grep -q ': hp:/'" $["exit":0, "srderr":"", "stdout":""] -Execute .target.bash "test -f /etc/init.d/lpd && /etc/init.d/lpd stop" 0 -Execute .target.bash "test -f /etc/init.d/cups && /etc/init.d/cups stop" 0 -Execute .target.bash "test -f /etc/init.d/cups && /etc/init.d/cups start" 0 -Return true +Read .init.scripts.exists "lpd" true +Execute .target.bash "/usr/bin/lpstat -r 2>/dev/null" 0 +Return false Dump ==================================================== Read .target.size "/var/run/listen_remote_ipp.pid" 555 Read .target.string "/var/run/listen_remote_ipp.pid" "" @@ -31,23 +25,9 @@ Write .etc.cups.cupsd_conf nil true Execute .target.bash_output "diff /etc/cups/cupsd.conf /etc/cups/cupsd.conf.old|grep -c ''" $["exit":0, "srderr":"", "stdout":""] Execute .target.bash "rm /etc/cups/cupsd.conf.old" 0 -Write .cups.printers.remove "lpx" true -Execute .target.bash "/bin/grep '#this database was generated during package building' /var/lib/YaST2/ppd_db.ycp" 0 -Read .ppd.db.changed false -Read .target.ycp "/var/lib/YaST2/ppd_db.ycp" $["":$["":$["":$["filename":"filename"]]]] -Read .target.tmpdir "/tmp" -Write .ppd.file.modify ["filename", "/tmp/patched_ppd_lp", $[]] true -Read .target.size "/tmp/patched_ppd_lp" 555 -Write .cups.printers.add $["accepting":true, "allowusers":[], "bannerend":"none", "bannerstart":"none", "changed":true, "default":true, "denyusers":[], "name":"lp", "ppd":"/tmp/patched_ppd_lp", "state":"idle", "uri":"parallel://dev/lp0"] true -Write .cups.default_dest "lp" true -Write .target.ycp "/var/lib/YaST2/printers" $["cups_usb_devices":`always, "drivers_were_installed":nil, "printers":[$["name":"lp", "uri":"parallel://dev/lp0"]], "version":523] true -Execute .target.bash "/bin/chmod 600 /var/lib/YaST2/printers" 0 -Execute .target.bash "test -f /etc/init.d/lpd && /etc/init.d/lpd stop" 0 -Execute .target.bash "test -f /etc/init.d/cups && /etc/init.d/cups stop" 0 -Execute .target.bash "test -f /etc/init.d/cups && /etc/init.d/cups start" 0 -Execute .target.bash_output "/usr/bin/lpstat -v | /bin/grep -q ': hp:/'" $["exit":0, "srderr":"", "stdout":""] Execute .target.bash "test -f /etc/init.d/lpd && /etc/init.d/lpd stop" 0 Execute .target.bash "test -f /etc/init.d/cups && /etc/init.d/cups stop" 0 -Execute .target.bash "test -f /etc/init.d/cups && /etc/init.d/cups start" 0 -Return true +Read .init.scripts.exists "lpd" true +Execute .target.bash "/usr/bin/lpstat -r 2>/dev/null" 0 +Return false Dump ==================================================== diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.14.22/VERSION new/yast2-printer-2.14.23/VERSION --- old/yast2-printer-2.14.22/VERSION 2007-02-21 15:35:17.000000000 +0100 +++ new/yast2-printer-2.14.23/VERSION 2007-04-03 14:49:09.000000000 +0200 @@ -1 +1 @@ -2.14.22 +2.14.23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-pkg-bindings
by root＠Hilbert.suse.de 03 Apr '07

03 Apr '07

Hello community, here is the log from the commit of package yast2-pkg-bindings checked in at Tue Apr 3 20:40:40 CEST 2007. -------- --- yast2-pkg-bindings/yast2-pkg-bindings.changes 2007-02-21 17:56:43.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-pkg-bindings/yast2-pkg-bindings.changes 2007-04-02 14:26:18.681274000 +0200 @@ -1,0 +2,8 @@ +Mon Apr 2 13:58:44 CEST 2007 - lslezak(a)suse.cz + +- new callbacks Pkg::CallbackSourceCreateInit/Destroy() and + Pkg::CallbackSourceReportInit() - handle the ctor/dtor of libzypp + callbacks (#251726) +- 2.15.13 + +------------------------------------------------------------------- Old: ---- yast2-pkg-bindings-2.15.12.tar.bz2 New: ---- yast2-pkg-bindings-2.15.13.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-pkg-bindings.spec ++++++ --- /var/tmp/diff_new_pack.i22493/_old 2007-04-03 20:40:31.000000000 +0200 +++ /var/tmp/diff_new_pack.i22493/_new 2007-04-03 20:40:31.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-pkg-bindings (Version 2.15.12) +# spec file for package yast2-pkg-bindings (Version 2.15.13) # # 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-pkg-bindings -Version: 2.15.12 +Version: 2.15.13 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-pkg-bindings-2.15.12.tar.bz2 +Source0: yast2-pkg-bindings-2.15.13.tar.bz2 prefix: /usr BuildRequires: blocxx-devel boost boost-devel dbus-1-devel docbook-xsl-stylesheets doxygen gcc-c++ hal-devel libgcrypt-devel libxcrypt-devel libxslt perl-XML-Writer rpm-devel sgml-skel yast2-core-devel yast2-devtools BuildRequires: libzypp-devel >= 2.14.3 @@ -40,7 +40,7 @@ Stanislav Visnovsky <visnov(a)suse.cz> %prep -%setup -n yast2-pkg-bindings-2.15.12 +%setup -n yast2-pkg-bindings-2.15.13 %build %{prefix}/bin/y2tool y2autoconf @@ -71,6 +71,11 @@ %doc %{prefix}/share/doc/packages/yast2-pkg-bindings %changelog +* Mon Apr 02 2007 - lslezak(a)suse.cz +- new callbacks Pkg::CallbackSourceCreateInit/Destroy() and + Pkg::CallbackSourceReportInit() - handle the ctor/dtor of libzypp + callbacks (#251726) +- 2.15.13 * Wed Feb 21 2007 - lslezak(a)suse.cz - display redirected URL instead of the original URL in the media change popup (#157040) ++++++ yast2-pkg-bindings-2.15.12.tar.bz2 -> yast2-pkg-bindings-2.15.13.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.15.12/configure new/yast2-pkg-bindings-2.15.13/configure --- old/yast2-pkg-bindings-2.15.12/configure 2007-02-21 17:55:48.000000000 +0100 +++ new/yast2-pkg-bindings-2.15.13/configure 2007-04-02 14:16:47.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-pkg-bindings 2.15.12. +# Generated by GNU Autoconf 2.60 for yast2-pkg-bindings 2.15.13. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -713,8 +713,8 @@ # Identity of this package. PACKAGE_NAME='yast2-pkg-bindings' PACKAGE_TARNAME='yast2-pkg-bindings' -PACKAGE_VERSION='2.15.12' -PACKAGE_STRING='yast2-pkg-bindings 2.15.12' +PACKAGE_VERSION='2.15.13' +PACKAGE_STRING='yast2-pkg-bindings 2.15.13' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1429,7 +1429,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-pkg-bindings 2.15.12 to adapt to many kinds of systems. +\`configure' configures yast2-pkg-bindings 2.15.13 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1500,7 +1500,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-pkg-bindings 2.15.12:";; + short | recursive ) echo "Configuration of yast2-pkg-bindings 2.15.13:";; esac cat <<\_ACEOF @@ -1608,7 +1608,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-pkg-bindings configure 2.15.12 +yast2-pkg-bindings configure 2.15.13 generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1622,7 +1622,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-pkg-bindings $as_me 2.15.12, which was +It was created by yast2-pkg-bindings $as_me 2.15.13, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -2423,7 +2423,7 @@ # Define the identity of the package. PACKAGE='yast2-pkg-bindings' - VERSION='2.15.12' + VERSION='2.15.13' cat >>confdefs.h <<_ACEOF @@ -2650,7 +2650,7 @@ -VERSION="2.15.12" +VERSION="2.15.13" RPMNAME="yast2-pkg-bindings" MAINTAINER="Ladislav Slezák <lslezak(a)suse.cz>" @@ -21612,7 +21612,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-pkg-bindings $as_me 2.15.12, which was +This file was extended by yast2-pkg-bindings $as_me 2.15.13, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21665,7 +21665,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-pkg-bindings config.status 2.15.12 +yast2-pkg-bindings config.status 2.15.13 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-pkg-bindings-2.15.12/configure.in new/yast2-pkg-bindings-2.15.13/configure.in --- old/yast2-pkg-bindings-2.15.12/configure.in 2007-02-21 17:55:36.000000000 +0100 +++ new/yast2-pkg-bindings-2.15.13/configure.in 2007-04-02 14:16:31.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-pkg-bindings, 2.15.12, http://bugs.opensuse.org/, yast2-pkg-bindings) +AC_INIT(yast2-pkg-bindings, 2.15.13, http://bugs.opensuse.org/, yast2-pkg-bindings) 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.12" +VERSION="2.15.13" RPMNAME="yast2-pkg-bindings" MAINTAINER="Ladislav Slezák <lslezak(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.15.12/src/Callbacks.cc new/yast2-pkg-bindings-2.15.13/src/Callbacks.cc --- old/yast2-pkg-bindings-2.15.12/src/Callbacks.cc 2007-02-21 10:51:55.000000000 +0100 +++ new/yast2-pkg-bindings-2.15.13/src/Callbacks.cc 2007-03-29 15:24:22.000000000 +0200 @@ -87,10 +87,12 @@ virtual void reportbegin() { + y2milestone("Convert DB Init Callback"); } virtual void reportend() { + y2milestone("Convert DB Destroy Callback"); } virtual void start(zypp::Pathname pname) { @@ -972,6 +974,28 @@ { SourceCreateReceive( RecipientCtl & construct_r ) : Recipient( construct_r ) {} + virtual void reportbegin() + { + CB callback( ycpcb( YCPCallbacks::CB_SourceCreateInit ) ); + y2debug("Source Create begin"); + + if (callback._set) + { + callback.evaluate(); + } + } + + virtual void reportend() + { + CB callback( ycpcb( YCPCallbacks::CB_SourceCreateDestroy ) ); + y2debug("Source Create destroy"); + + if (callback._set) + { + callback.evaluate(); + } + } + virtual void start( const zypp::Url &url ) { CB callback( ycpcb( YCPCallbacks::CB_SourceCreateStart ) ); @@ -1191,6 +1215,28 @@ struct SourceReport : public Recipient, public zypp::callback::ReceiveReport<zypp::source::SourceReport> { + virtual void reportbegin() + { + CB callback( ycpcb( YCPCallbacks::CB_SourceReportInit ) ); + y2debug("Source Report begin"); + + if (callback._set) + { + callback.evaluate(); + } + } + + virtual void reportend() + { + CB callback( ycpcb( YCPCallbacks::CB_SourceReportDestroy ) ); + y2debug("Source Report end"); + + if (callback._set) + { + callback.evaluate(); + } + } + SourceReport( RecipientCtl & construct_r ) : Recipient( construct_r ) {} virtual void start( zypp::Source_Ref source, const std::string &task ) @@ -2144,6 +2190,25 @@ } +YCPValue PkgModuleFunctions::CallbackSourceReportInit( const YCPString& func) +{ + return SET_YCP_CB( CB_SourceReportInit, func ); +} + +YCPValue PkgModuleFunctions::CallbackSourceReportDestroy( const YCPString& func) +{ + return SET_YCP_CB( CB_SourceReportDestroy, func ); +} + +YCPValue PkgModuleFunctions::CallbackSourceCreateInit( const YCPString& func) +{ + return SET_YCP_CB( CB_SourceCreateInit, func ); +} + +YCPValue PkgModuleFunctions::CallbackSourceCreateDestroy( const YCPString& func) +{ + return SET_YCP_CB( CB_SourceCreateDestroy, func ); +} /** * @builtin CallbackSourceProbeStart diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.15.12/src/Callbacks.YCP.h new/yast2-pkg-bindings-2.15.13/src/Callbacks.YCP.h --- old/yast2-pkg-bindings-2.15.12/src/Callbacks.YCP.h 2007-02-14 13:59:49.000000000 +0100 +++ new/yast2-pkg-bindings-2.15.13/src/Callbacks.YCP.h 2007-03-23 15:09:55.000000000 +0100 @@ -73,6 +73,7 @@ CB_StartPackage, CB_ProgressPackage, CB_DonePackage, CB_SourceCreateStart, CB_SourceCreateProgress, CB_SourceCreateError, CB_SourceCreateEnd, + CB_SourceCreateInit, CB_SourceCreateDestroy, CB_StartSourceRefresh, CB_ErrorSourceRefresh, CB_DoneSourceRefresh, CB_ProgressSourceRefresh, CB_StartDeltaDownload, CB_ProgressDeltaDownload, CB_ProblemDeltaDownload, @@ -82,7 +83,7 @@ CB_StartDownload, CB_ProgressDownload, CB_DoneDownload, CB_SourceProbeStart, CB_SourceProbeFailed, CB_SourceProbeSucceeded, CB_SourceProbeEnd, CB_SourceProbeProgress, CB_SourceProbeError, - CB_SourceReportStart, CB_SourceReportProgress, CB_SourceReportError, CB_SourceReportEnd, + CB_SourceReportStart, CB_SourceReportProgress, CB_SourceReportError, CB_SourceReportEnd, CB_SourceReportInit, CB_SourceReportDestroy, CB_ScriptStart, CB_ScriptProgress, CB_ScriptProblem, CB_ScriptFinish, CB_Message, @@ -142,6 +143,8 @@ ENUM_OUT( SourceCreateProgress ); ENUM_OUT( SourceCreateError ); ENUM_OUT( SourceCreateEnd ); + ENUM_OUT( SourceCreateInit ); + ENUM_OUT( SourceCreateDestroy ); ENUM_OUT( SourceProbeStart ); ENUM_OUT( SourceProbeFailed ); @@ -154,6 +157,8 @@ ENUM_OUT( SourceReportProgress ); ENUM_OUT( SourceReportError ); ENUM_OUT( SourceReportEnd ); + ENUM_OUT( SourceReportInit ); + ENUM_OUT( SourceReportDestroy ); ENUM_OUT( StartSourceRefresh ); ENUM_OUT( ErrorSourceRefresh ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.15.12/src/PkgModuleFunctions.h new/yast2-pkg-bindings-2.15.13/src/PkgModuleFunctions.h --- old/yast2-pkg-bindings-2.15.12/src/PkgModuleFunctions.h 2007-02-15 10:29:30.000000000 +0100 +++ new/yast2-pkg-bindings-2.15.13/src/PkgModuleFunctions.h 2007-03-23 15:11:47.000000000 +0100 @@ -113,6 +113,8 @@ // callback related funcions void CallSourceReportStart(const std::string &text); void CallSourceReportEnd(const std::string &text); + void CallSourceReportInit(); + void CallSourceReportDestroy(); // After all, APPL_HIGH might be more appropriate, because we suggest // the user what he should do and if it does not work, it's his job to @@ -224,6 +226,10 @@ YCPValue CallbackSourceCreateError( const YCPString& func); /* TYPEINFO: void(string) */ YCPValue CallbackSourceCreateEnd( const YCPString& func); + /* TYPEINFO: void(string) */ + YCPValue CallbackSourceCreateInit( const YCPString& func); + /* TYPEINFO: void(string) */ + YCPValue CallbackSourceCreateDestroy( const YCPString& func); /* TYPEINFO: void(string) */ YCPValue CallbackSourceProbeStart( const YCPString& func); @@ -239,6 +245,10 @@ YCPValue CallbackSourceProbeError( const YCPString& func); /* TYPEINFO: void(string) */ + YCPValue CallbackSourceReportInit( const YCPString& func); + /* TYPEINFO: void(string) */ + YCPValue CallbackSourceReportDestroy( const YCPString& func); + /* TYPEINFO: void(string) */ YCPValue CallbackSourceReportStart( const YCPString& func); /* TYPEINFO: void(string) */ YCPValue CallbackSourceReportProgress( const YCPString& func); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.15.12/src/Source.cc new/yast2-pkg-bindings-2.15.13/src/Source.cc --- old/yast2-pkg-bindings-2.15.12/src/Source.cc 2007-02-21 14:30:44.000000000 +0100 +++ new/yast2-pkg-bindings-2.15.13/src/Source.cc 2007-03-23 11:17:53.000000000 +0100 @@ -85,6 +85,31 @@ } } +void PkgModuleFunctions::CallSourceReportInit() +{ + // get the YCP callback handler for init event + Y2Function* ycp_handler = _callbackHandler._ycpCallbacks.createCallback(CallbackHandler::YCPCallbacks::CB_SourceReportInit); + + // is the callback registered? + if (ycp_handler != NULL) + { + // evaluate the callback function + ycp_handler->evaluateCall(); + } +} + +void PkgModuleFunctions::CallSourceReportDestroy() +{ + // get the YCP callback handler for destroy event + Y2Function* ycp_handler = _callbackHandler._ycpCallbacks.createCallback(CallbackHandler::YCPCallbacks::CB_SourceReportDestroy); + + // is the callback registered? + if (ycp_handler != NULL) + { + // evaluate the callback function + ycp_handler->evaluateCall(); + } +} /** * Logging helper: * call zypp::SourceManager::sourceManager()->findSource @@ -135,6 +160,7 @@ YCPValue PkgModuleFunctions::SourceRestore() { + CallSourceReportInit(); CallSourceReportStart(_("Downloading files...")); bool success = true; @@ -170,6 +196,7 @@ } CallSourceReportEnd(_("Downloading files...")); + CallSourceReportDestroy(); return YCPBoolean(success); } @@ -188,6 +215,7 @@ { bool success = true; + CallSourceReportInit(); CallSourceReportStart(_("Parsing files...")); std::list<zypp::SourceManager::SourceId> ids; @@ -248,6 +276,7 @@ } CallSourceReportEnd(_("Parsing files...")); + CallSourceReportDestroy(); return YCPBoolean(success); } @@ -689,6 +718,7 @@ YCPValue PkgModuleFunctions::SourceProvideFile (const YCPInteger& id, const YCPInteger& mid, const YCPString& f) { + CallSourceReportInit(); CallSourceReportStart(_("Downloading file...")); zypp::Source_Ref src; @@ -718,6 +748,7 @@ } CallSourceReportEnd(_("Downloading file...")); + CallSourceReportDestroy(); if (found) { @@ -747,6 +778,7 @@ YCPValue PkgModuleFunctions::SourceProvideOptionalFile (const YCPInteger& id, const YCPInteger& mid, const YCPString& f) { + CallSourceReportInit(); CallSourceReportStart(_("Downloading files...")); YCPValue ret; @@ -790,6 +822,7 @@ CallSourceReportEnd(_("Downloading files...")); + CallSourceReportDestroy(); if (found) { @@ -1265,9 +1298,11 @@ src.enable(); + CallSourceReportInit(); CallSourceReportStart(_("Parsing files...")); zypp_ptr()->addResolvables (src.resolvables()); CallSourceReportEnd(_("Parsing files...")); + CallSourceReportDestroy(); // return the id of the first product if ( ret == -1 ) @@ -1292,9 +1327,11 @@ src.enable(); + CallSourceReportInit(); CallSourceReportStart(_("Parsing files...")); zypp_ptr()->addResolvables (src.resolvables()); CallSourceReportEnd(_("Parsing files...")); + CallSourceReportDestroy(); } catch ( const zypp::Exception& excpt) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.15.12/VERSION new/yast2-pkg-bindings-2.15.13/VERSION --- old/yast2-pkg-bindings-2.15.12/VERSION 2007-02-21 17:49:01.000000000 +0100 +++ new/yast2-pkg-bindings-2.15.13/VERSION 2007-04-02 13:58:34.000000000 +0200 @@ -1 +1 @@ -2.15.12 +2.15.13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-packager
by root＠Hilbert.suse.de 03 Apr '07

03 Apr '07

Hello community, here is the log from the commit of package yast2-packager checked in at Tue Apr 3 20:40:24 CEST 2007. -------- --- yast2-packager/yast2-packager.changes 2007-03-28 17:07:19.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-packager/yast2-packager.changes 2007-04-02 14:43:06.000000000 +0200 @@ -1,0 +2,22 @@ +Mon Apr 2 14:40:41 CEST 2007 - locilka(a)suse.cz + +- Making SLP Catalog Details wider and higher. The exact dialog + size depends on selected UI and ammount of information presented + in table (#237337). +- 2.15.28 + +------------------------------------------------------------------- +Mon Apr 2 14:31:04 CEST 2007 - lslezak(a)suse.cz + +- Pkg::CallbackSourceCreateInit/Destroy() and + Pkg::CallbackSourceReportInit() handlers (#251726) +- 2.15.27 + +------------------------------------------------------------------- +Fri Mar 30 13:40:51 CEST 2007 - locilka(a)suse.cz + +- Added global variable into AddOnProduct that informs installation + whether low-memory issue has been already reported or not + (bugzilla #239630). + +------------------------------------------------------------------- Old: ---- yast2-packager-2.15.26.tar.bz2 New: ---- yast2-packager-2.15.28.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.O16833/_old 2007-04-03 20:39:51.000000000 +0200 +++ /var/tmp/diff_new_pack.O16833/_new 2007-04-03 20:39:51.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-packager (Version 2.15.26) +# spec file for package yast2-packager (Version 2.15.28) # # 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-packager -Version: 2.15.26 +Version: 2.15.28 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-packager-2.15.26.tar.bz2 +Source0: yast2-packager-2.15.28.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxcrypt-devel libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-country yast2-devtools yast2-slp yast2-testsuite yast2-xml BuildRequires: yast2 >= 2.15.22 @@ -49,7 +49,7 @@ Arvin Schnell <arvin(a)suse.de> %prep -%setup -n yast2-packager-2.15.26 +%setup -n yast2-packager-2.15.28 %build %{prefix}/bin/y2tool y2autoconf @@ -88,6 +88,19 @@ %doc %{prefix}/share/doc/packages/yast2-packager %changelog +* Mon Apr 02 2007 - locilka(a)suse.cz +- Making SLP Catalog Details wider and higher. The exact dialog + size depends on selected UI and ammount of information presented + in table (#237337). +- 2.15.28 +* Mon Apr 02 2007 - lslezak(a)suse.cz +- Pkg::CallbackSourceCreateInit/Destroy() and + Pkg::CallbackSourceReportInit() handlers (#251726) +- 2.15.27 +* Fri Mar 30 2007 - locilka(a)suse.cz +- Added global variable into AddOnProduct that informs installation + whether low-memory issue has been already reported or not + (bugzilla #239630). * Wed Mar 28 2007 - locilka(a)suse.cz - Moved some testsuites from yast2-packager to yast2 - 2.15.26 ++++++ yast2-packager-2.15.26.tar.bz2 -> yast2-packager-2.15.28.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.26/configure new/yast2-packager-2.15.28/configure --- old/yast2-packager-2.15.26/configure 2007-03-28 16:36:30.000000000 +0200 +++ new/yast2-packager-2.15.28/configure 2007-04-02 15:06:06.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-packager 2.15.25. +# Generated by GNU Autoconf 2.60 for yast2-packager 2.15.28. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -559,8 +559,8 @@ # Identity of this package. PACKAGE_NAME='yast2-packager' PACKAGE_TARNAME='yast2-packager' -PACKAGE_VERSION='2.15.25' -PACKAGE_STRING='yast2-packager 2.15.25' +PACKAGE_VERSION='2.15.28' +PACKAGE_STRING='yast2-packager 2.15.28' 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-packager 2.15.25 to adapt to many kinds of systems. +\`configure' configures yast2-packager 2.15.28 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-packager 2.15.25:";; + short | recursive ) echo "Configuration of yast2-packager 2.15.28:";; esac cat <<\_ACEOF @@ -1330,7 +1330,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-packager configure 2.15.25 +yast2-packager configure 2.15.28 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-packager $as_me 2.15.25, which was +It was created by yast2-packager $as_me 2.15.28, 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-packager' - VERSION='2.15.25' + VERSION='2.15.28' cat >>confdefs.h <<_ACEOF @@ -2372,7 +2372,7 @@ -VERSION="2.15.25" +VERSION="2.15.28" RPMNAME="yast2-packager" MAINTAINER="Ladislav Slezak <lslezak(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-packager $as_me 2.15.25, which was +This file was extended by yast2-packager $as_me 2.15.28, 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-packager config.status 2.15.25 +yast2-packager config.status 2.15.28 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-packager-2.15.26/configure.in new/yast2-packager-2.15.28/configure.in --- old/yast2-packager-2.15.26/configure.in 2007-03-28 16:36:23.000000000 +0200 +++ new/yast2-packager-2.15.28/configure.in 2007-04-02 15:06:01.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-packager, 2.15.25, http://bugs.opensuse.org/, yast2-packager) +AC_INIT(yast2-packager, 2.15.28, http://bugs.opensuse.org/, yast2-packager) 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.25" +VERSION="2.15.28" RPMNAME="yast2-packager" MAINTAINER="Ladislav Slezak <lslezak(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.26/src/modules/AddOnProduct.ycp new/yast2-packager-2.15.28/src/modules/AddOnProduct.ycp --- old/yast2-packager-2.15.26/src/modules/AddOnProduct.ycp 2007-03-28 09:05:42.000000000 +0200 +++ new/yast2-packager-2.15.28/src/modules/AddOnProduct.ycp 2007-03-30 13:35:40.000000000 +0200 @@ -82,6 +82,10 @@ global list <integer> mode_config_sources = []; +// Bugzilla #239630 +// In installation: check for low-memory machines +global boolean low_memory_already_reported = false; + /** * Adapts the inst-sys from the tarball * @param filename string the filename with the tarball to use to the update diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.26/src/modules/PackageCallbacks.ycp new/yast2-packager-2.15.28/src/modules/PackageCallbacks.ycp --- old/yast2-packager-2.15.26/src/modules/PackageCallbacks.ycp 2007-02-26 09:30:10.000000000 +0100 +++ new/yast2-packager-2.15.28/src/modules/PackageCallbacks.ycp 2007-04-02 14:40:07.000000000 +0200 @@ -7,7 +7,7 @@ * * Purpose: provides the default Callbacks for Pkg:: * - * $Id: PackageCallbacks.ycp 36354 2007-02-21 16:01:56Z lslezak $ + * $Id: PackageCallbacks.ycp 37257 2007-04-02 12:32:45Z lslezak $ * */ @@ -52,6 +52,9 @@ string back_string = "\b\b\b\b\b\b\b\b\b\b"; string clear_string = back_string + " " + back_string; + // max. length of the text in the source popup window + integer max_size = 60; + //-------------------------------------------------------------------------- // defaults @@ -827,84 +830,50 @@ return ret; } -void OpenSourcePopup(string text) +void OpenSourcePopup() { - integer max_size = 60; - if (_source_open == 0) { - // the popup doesn't exist - y2milestone("Opening source progress popup: %1", text); - - // if the text is too long then display only part of the message - // and then refresh the label to the full string - // reason: display a small popup, but user can resize it to see - // the full message - string display = text; - boolean refresh_label = false; - - // Qt UI uses bold font, the string must be shortened even more - integer ui_adjustment = UI::GetDisplayInfo()["TextMode"]:false ? 0 : 5; - - if (size(display) > max_size - ui_adjustment) - { - display = ProcessMessage(display, max_size - ui_adjustment); - } - - // truncate long text - if (size(display) > max_size - ui_adjustment) - { - // ellipsis appended to a truncated text (if it's too long) - string ellipsis = _("..."); - display = substring(display, 0, max_size - ui_adjustment - 1 - size(ellipsis)) + ellipsis; - refresh_label = true; - } - UI::OpenDialog( `VBox( `HSpacing(max_size), - `Heading(`id(`label_source_popup), `opt(`hstretch), display), + `Heading(`id(`label_source_popup), `opt(`hstretch), " "), `ProgressBar (`id (`progress), " ", 100, 0) ) ); - - // set the full text if needed - if (refresh_label) - { - UI::ChangeWidget(`label, `Value, text); - } } - else - { - // Qt uses proportional font, the string might be longer - integer ui_adjustment = UI::GetDisplayInfo()["TextMode"]:false ? 0 : 6; - if (size(text) > max_size + ui_adjustment) - { - text = ProcessMessage(text, max_size + ui_adjustment); - } + _source_open = _source_open + 1; + y2milestone("OpenSourcePopup: _source_open: %1", _source_open); +} + +void SetHeaderSourcePopup(string text) +{ + // Qt UI uses bold font, the string must be shortened even more + integer ui_adjustment = UI::GetDisplayInfo()["TextMode"]:false ? 0 : 5; - // refresh the labels in the popup - UI::ChangeWidget(`progress, `Label, text); - // reset the progressbar - UI::ChangeWidget(`progress, `Value, 0); - y2milestone("OpenSourcePopup: new label: %1", text); + if (size(text) > max_size - ui_adjustment) + { + text = ProcessMessage(text, max_size - ui_adjustment); } - _source_open = _source_open + 1; - y2milestone("OpenSourcePopup: _source_open: %1", _source_open); + UI::ChangeWidget(`label_source_popup, `Value, text); + y2milestone("SourcePopup: new header: %1", text); } -boolean SourcePopupSetProgress(integer value) +void SetLabelSourcePopup(string text) { - if (_source_open > 0) + // Qt uses proportional font, the string might be longer + integer ui_adjustment = UI::GetDisplayInfo()["TextMode"]:false ? 0 : 6; + + if (size(text) > max_size + ui_adjustment) { - UI::ChangeWidget (`id (`progress), `Value, value); - any input = UI::PollInput (); - if (input == `abort) - return false; + text = ProcessMessage(text, max_size + ui_adjustment); } - return true; + + // refresh the label in the popup + UI::ChangeWidget(`progress, `Label, text); + y2milestone("SourcePopup: new label: %1", text); } // is the top level window source popup? @@ -914,6 +883,18 @@ UI::WidgetExists(`id(`label_source_popup)); } +boolean SourcePopupSetProgress(integer value) +{ + if (_source_open > 0 && IsSourcePopup()) + { + UI::ChangeWidget (`id (`progress), `Value, value); + any input = UI::PollInput (); + if (input == `abort) + return false; + } + return true; +} + void CloseSourcePopup() { if (!IsSourcePopup()) @@ -924,9 +905,6 @@ _source_open = _source_open - 1; - // set 100% progress - SourcePopupSetProgress(100); - if (_source_open == 0) { y2milestone("Closing source progress popup"); @@ -935,26 +913,23 @@ y2milestone("CloseSourcePopup: _source_open: %1", _source_open); } -// completely close the source popup window (all instances) -// should be called if an error occurrs -void CloseSourcePopupAll() + +global void SourceCreateInit() { - if (!IsSourcePopup()) - { - y2error("The toplevel dialog is not a source popup dialog!"); - return; - } + y2milestone ("SourceCreateInit"); - _source_open = 0; + OpenSourcePopup(); +} - // set 100% progress - SourcePopupSetProgress(100); +global void SourceCreateDestroy() +{ + y2milestone ("SourceCreateDestroy"); - y2milestone("Closing source progress popup - all instances"); - UI::CloseDialog(); + CloseSourcePopup(); } -global void SourceCreateStart(string url) { +global void SourceCreateStart(string url) +{ y2milestone ("SourceCreateStart: %1", url); // popup label (%1 is source URL) @@ -965,7 +940,16 @@ } else { - OpenSourcePopup(sformat(_("Creating source %1"), url)); + y2internal("_source_open: %1", _source_open); + + if (_source_open == 1) + { + SetHeaderSourcePopup(msg); + } + else + { + SetLabelSourcePopup(msg); + } } } @@ -1031,14 +1015,13 @@ UI::CloseDialog (); y2milestone ("Source create error: Returning %1", ret); - CloseSourcePopupAll(); - return ret; } global void SourceCreateEnd(string url, symbol error, string description) { - CloseSourcePopup(); + // set 100% progress + SourcePopupSetProgress(100); y2milestone ("Source create end: error: url: %1, error: %2, description: %3", url, error, description); } @@ -1057,8 +1040,18 @@ } else { - OpenSourcePopup(_("Probing source...")); - OpenSourcePopup(sformat(_("Probing source %1"), url)); + OpenSourcePopup(); + + string msg = sformat(_("Probing source %1"), url); + + if (_source_open == 1) + { + SetHeaderSourcePopup(msg); + } + else + { + SetLabelSourcePopup(msg); + } } } @@ -1157,7 +1150,16 @@ } else { - OpenSourcePopup(task); + y2internal("_source_open: %1", _source_open); + + if (_source_open == 1) + { + SetHeaderSourcePopup(task); + } + else + { + SetLabelSourcePopup(task); + } } } @@ -1222,16 +1224,27 @@ UI::CloseDialog (); y2milestone ("Source report error: Returning %1", ret); - CloseSourcePopupAll(); - return ret; } global void SourceReportEnd(integer src_id, string url, string task, symbol error, string description) { - CloseSourcePopup(); - y2milestone ("Source report end: src: %1, url: %2, task: %3, error: %4, description: %5", src_id, url, task, error, description); + + // set 100% progress + SourcePopupSetProgress(100); +} + +global void SourceReportInit() +{ + y2milestone("Source report init"); + OpenSourcePopup(); +} + +global void SourceReportDestroy() +{ + y2milestone("Source report destroy"); + CloseSourcePopup(); } /** at start of delta providal diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.26/src/modules/SourceManagerSLP.ycp new/yast2-packager-2.15.28/src/modules/SourceManagerSLP.ycp --- old/yast2-packager-2.15.26/src/modules/SourceManagerSLP.ycp 2007-02-19 15:23:19.000000000 +0100 +++ new/yast2-packager-2.15.28/src/modules/SourceManagerSLP.ycp 2007-04-02 14:40:00.000000000 +0200 @@ -162,16 +162,52 @@ // message popup Report::Message(_("No details are available.")); } else { + // maximal size allowed by UI (with a fallback) + map display_information = UI::GetDisplayInfo(); + integer max_width = display_information["Width"]:1200; + integer max_heigth = display_information["Height"]:500; + // Graphical UI returns 1280x1024, textmode 80x25 + if (! display_information["TextMode"]:false) { + max_width = max_width / 15; + max_heigth = max_heigth / 18; + } + + // maximal length of key and val found + integer max_len_key = 0; + integer max_len_val = 0; + list <term> details = []; + integer curr_len_key = 0; + integer curr_len_val = 0; + foreach (any key, any value, service_details, { - details = add (details, `item (`id(nil), tostring (key), tostring (value))); + details = add (details, `item (`id (nil), tostring (key), tostring (value))); + curr_len_key = size (tostring (key)); + curr_len_val = size (tostring (value)); + + if (curr_len_key != nil && curr_len_key > max_len_key) max_len_key = curr_len_key; + if (curr_len_val != nil && curr_len_val > max_len_val) max_len_val = curr_len_val; }); + // maximal key + maximal val (presented in table) + integer max_len_total = max_len_key + max_len_val; + + // min X in UI + integer min_size_x = max_len_total; + if (min_size_x > max_width) min_size_x = max_width; + if (min_size_x < 60) min_size_x = 60; + + // min Y in UI + integer min_size_y = size (details) + 4; + if (min_size_y > max_heigth) min_size_y = max_heigth; + if (min_size_y < 14) min_size_y = 14; + + y2milestone ("Details min size: %1 x %2", min_size_x, min_size_y); UI::OpenDialog ( `VBox ( `Left (`Heading(`id(`details_heading), _("Catalog Details"))), `MinSize ( - 60, 16, + min_size_x, min_size_y, `Table ( `header( // table header item diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-packager-2.15.26/VERSION new/yast2-packager-2.15.28/VERSION --- old/yast2-packager-2.15.26/VERSION 2007-03-28 17:07:24.000000000 +0200 +++ new/yast2-packager-2.15.28/VERSION 2007-04-02 14:43:21.000000000 +0200 @@ -1 +1 @@ -2.15.26 +2.15.28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-network
by root＠Hilbert.suse.de 03 Apr '07

03 Apr '07

Hello community, here is the log from the commit of package yast2-network checked in at Tue Apr 3 20:39:44 CEST 2007. -------- --- yast2-network/yast2-network.changes 2007-03-28 17:19:18.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-network/yast2-network.changes 2007-04-03 14:15:32.370476000 +0200 @@ -1,0 +2,10 @@ +Tue Apr 3 13:36:25 CEST 2007 - kmachalkova(a)suse.cz + +- Network installation proposal: + * NetworkManager and IPv6 proposals joined into 'General Settings' + proposal + * Make click on 'General Settings' title open separate dialog with + NM and IPv6 options (#255609) +- 2.15.21 + +------------------------------------------------------------------- Old: ---- yast2-network-2.15.20.tar.bz2 New: ---- yast2-network-2.15.21.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-network.spec ++++++ --- /var/tmp/diff_new_pack.r15859/_old 2007-04-03 20:39:08.000000000 +0200 +++ /var/tmp/diff_new_pack.r15859/_new 2007-04-03 20:39:08.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-network (Version 2.15.20) +# spec file for package yast2-network (Version 2.15.21) # # 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-network -Version: 2.15.20 +Version: 2.15.21 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-network-2.15.20.tar.bz2 +Source0: yast2-network-2.15.21.tar.bz2 prefix: /usr # should be required by devtools BuildRequires: perl-XML-Writer pkgconfig @@ -51,7 +51,7 @@ Michal Svec <msvec(a)suse.cz> %prep -%setup -n yast2-network-2.15.20 +%setup -n yast2-network-2.15.21 %build %{prefix}/bin/y2tool y2autoconf @@ -107,6 +107,13 @@ /usr/share/YaST2/schema/autoyast/rnc/proxy.rnc %changelog +* Tue Apr 03 2007 - kmachalkova(a)suse.cz +- Network installation proposal: + * NetworkManager and IPv6 proposals joined into 'General Settings' + proposal + * Make click on 'General Settings' title open separate dialog with + NM and IPv6 options (#255609) +- 2.15.21 * Wed Mar 28 2007 - kmachalkova(a)suse.cz - Make storing hostname and DNS data work again - Further improvements to UI (FaTE #120077) ++++++ yast2-network-2.15.20.tar.bz2 -> yast2-network-2.15.21.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.20/src/clients/general_proposal.ycp new/yast2-network-2.15.21/src/clients/general_proposal.ycp --- old/yast2-network-2.15.20/src/clients/general_proposal.ycp 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-network-2.15.21/src/clients/general_proposal.ycp 2007-04-03 13:30:05.000000000 +0200 @@ -0,0 +1,113 @@ +/** + * File: clients/networkmanager_proposal.ycp + * Package: Network configuration + * Summary: Network mode proposal + * Authors: Martin Vidner <mvidner(a)suse.cz> + * + * $Id: general_proposal.ycp 37281 2007-04-03 11:30:04Z kmachalkova $ + * + * This is not a standalone proposal, it depends on lan_proposal. It + * must run after it. + */ + +{ + +textdomain "network"; + +/* The main () */ +y2milestone("----------------------------------------"); +y2milestone("General network settings proposal started"); +y2milestone("Arguments: %1", WFM::Args()); + +import "Lan"; +import "NetworkService"; + +include "network/lan/complex.ycp"; + +list args = WFM::Args(); + +string func = args[0]:""; +map param = args[1]:$[]; +map ret = $[]; + +/* create a textual proposal */ +if(func == "MakeProposal") { + string proposal = ""; + list<string> links = []; + string warning = nil; + symbol warning_level = nil; + + list sum = Lan::SummaryGeneral (); + proposal = sum[0]:""; + links = sum[1]:[]; + + ret = $[ + "preformatted_proposal" : proposal, + "links" : links, + "warning_level" : warning_level, + "warning" : warning, + ]; +} +/* run the module */ +else if(func == "AskUser") { + string chosen_id = param["chosen_id"]:""; + symbol seq = `next; + + if (chosen_id == "lan--nm-enable") + { + NetworkService::SetManaged (true); + } + else if (chosen_id == "lan--nm-disable") + { + NetworkService::SetManaged (false); + } + else if(chosen_id == "ipv6-enable") + { + Lan::SetIPv6(true); + } + else if(chosen_id == "ipv6-disable") + { + Lan::SetIPv6(false); + } + else + { + Wizard::CreateDialog(); + Wizard::SetDesktopIcon("lan"); + + seq = ManagedDialog(); + Wizard::CloseDialog(); + } + Lan::proposal_valid = false; // repropose + Lan::SetModified (); + + ret = $[ + "workflow_sequence" : seq + ]; +} +/* create titles */ +else if(func == "Description") { + ret = $[ + /* RichText label */ + "rich_text_title" : _("General Network Settings"), + /* Menu label */ + "menu_title" : _("General &Network Settings"), + "id" : "networkmode", + ]; +} +/* write the proposal */ +else if (func == "Write") { + y2debug ("lan_proposal did it"); +} +/* unknown function */ +else { + y2error("unknown function: %1", func); +} + +/* Finish */ +y2debug("ret=%1", ret); +y2milestone("General network settings proposal finished"); +y2milestone("----------------------------------------"); +return ret; + +/* EOF */ +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.20/src/clients/ipv6_proposal.ycp new/yast2-network-2.15.21/src/clients/ipv6_proposal.ycp --- old/yast2-network-2.15.20/src/clients/ipv6_proposal.ycp 2007-03-12 16:05:02.000000000 +0100 +++ new/yast2-network-2.15.21/src/clients/ipv6_proposal.ycp 1970-01-01 01:00:00.000000000 +0100 @@ -1,100 +0,0 @@ -/** - * File: clients/ipv6_proposal.ycp - * Package: Network configuration - * Summary: Network mode proposal - * Authors: Michal Zugec <mzugec(a)novell.com> - */ - -{ - -textdomain "network"; - -/* The main () */ -y2milestone("----------------------------------------"); -y2milestone("ipv6 proposal started"); -y2milestone("Arguments: %1", WFM::Args()); - -import "Lan"; -import "NetworkService"; - -include "network/lan/complex.ycp"; - -list args = WFM::Args(); - -string func = args[0]:""; -map param = args[1]:$[]; -map ret = $[]; - -/* create a textual proposal */ -if(func == "MakeProposal") { - string proposal = ""; - list<string> links = []; - string warning = nil; - symbol warning_level = nil; - - list sum = Lan::SummaryIPv6 (); - proposal = sum[0]:""; - links = sum[1]:[]; - - ret = $[ - "preformatted_proposal" : proposal, - "links" : links, - "warning_level" : warning_level, - "warning" : warning, - ]; -} -/* run the module */ -else if(func == "AskUser") { - string chosen_id = param["chosen_id"]:""; - symbol seq = `next; - - if (chosen_id == "ipv6-enable") - { - Lan::SetIPv6 (true); - } - else if (chosen_id == "ipv6-disable") - { - Lan::SetIPv6 (false); - } - else - { - Wizard::CreateDialog(); - Wizard::SetDesktopIcon("lan"); - -// seq = IPv6Dialog(); - Wizard::CloseDialog(); - } - Lan::proposal_valid = false; // repropose - Lan::SetModified (); - - ret = $[ - "workflow_sequence" : seq - ]; -} -/* create titles */ -else if(func == "Description") { - ret = $[ - /* RichText label */ - "rich_text_title" : _("IPv6"), - /* Menu label */ - "menu_title" : _("IPv6"), - "id" : "ipv6suport", - ]; -} -/* write the proposal */ -else if (func == "Write") { - y2debug ("lan_proposal did it"); -} -/* unknown function */ -else { - y2error("unknown function: %1", func); -} - -/* Finish */ -y2debug("ret=%1", ret); -y2milestone("ipv6 proposal finished"); -y2milestone("----------------------------------------"); -return ret; - -/* EOF */ -} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.20/src/clients/networkmanager_proposal.ycp new/yast2-network-2.15.21/src/clients/networkmanager_proposal.ycp --- old/yast2-network-2.15.20/src/clients/networkmanager_proposal.ycp 2007-03-12 16:05:02.000000000 +0100 +++ new/yast2-network-2.15.21/src/clients/networkmanager_proposal.ycp 1970-01-01 01:00:00.000000000 +0100 @@ -1,105 +0,0 @@ -/** - * File: clients/networkmanager_proposal.ycp - * Package: Network configuration - * Summary: Network mode proposal - * Authors: Martin Vidner <mvidner(a)suse.cz> - * - * $Id: networkmanager_proposal.ycp 36863 2007-03-12 10:47:37Z mzugec $ - * - * This is not a standalone proposal, it depends on lan_proposal. It - * must run after it. - */ - -{ - -textdomain "network"; - -/* The main () */ -y2milestone("----------------------------------------"); -y2milestone("NetworkManager proposal started"); -y2milestone("Arguments: %1", WFM::Args()); - -import "Lan"; -import "NetworkService"; - -include "network/lan/complex.ycp"; - -list args = WFM::Args(); - -string func = args[0]:""; -map param = args[1]:$[]; -map ret = $[]; - -/* create a textual proposal */ -if(func == "MakeProposal") { - string proposal = ""; - list<string> links = []; - string warning = nil; - symbol warning_level = nil; - - list sum = Lan::SummaryNM (); - proposal = sum[0]:""; - links = sum[1]:[]; - - ret = $[ - "preformatted_proposal" : proposal, - "links" : links, - "warning_level" : warning_level, - "warning" : warning, - ]; -} -/* run the module */ -else if(func == "AskUser") { - string chosen_id = param["chosen_id"]:""; - symbol seq = `next; - - if (chosen_id == "lan--nm-enable") - { - NetworkService::SetManaged (true); - } - else if (chosen_id == "lan--nm-disable") - { - NetworkService::SetManaged (false); - } - else - { - Wizard::CreateDialog(); - Wizard::SetDesktopIcon("lan"); - -// seq = ManagedDialog(); - Wizard::CloseDialog(); - } - Lan::proposal_valid = false; // repropose - Lan::SetModified (); - - ret = $[ - "workflow_sequence" : seq - ]; -} -/* create titles */ -else if(func == "Description") { - ret = $[ - /* RichText label */ - "rich_text_title" : _("Network Mode"), - /* Menu label */ - "menu_title" : _("Network Mo&de"), - "id" : "networkmode", - ]; -} -/* write the proposal */ -else if (func == "Write") { - y2debug ("lan_proposal did it"); -} -/* unknown function */ -else { - y2error("unknown function: %1", func); -} - -/* Finish */ -y2debug("ret=%1", ret); -y2milestone("NetworkManager proposal finished"); -y2milestone("----------------------------------------"); -return ret; - -/* EOF */ -} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.20/src/lan/complex.ycp new/yast2-network-2.15.21/src/lan/complex.ycp --- old/yast2-network-2.15.20/src/lan/complex.ycp 2007-03-28 11:28:18.000000000 +0200 +++ new/yast2-network-2.15.21/src/lan/complex.ycp 2007-04-03 13:17:05.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Summary, overview and IO dialogs for network cards config * Authors: Michal Svec <msvec(a)suse.cz> * - * $Id: complex.ycp 37161 2007-03-28 09:28:18Z kmachalkova $ + * $Id: complex.ycp 37280 2007-04-03 11:17:03Z kmachalkova $ */ { @@ -44,7 +44,6 @@ define boolean Modified() ``{ boolean ret = Lan::Modified() || DNS::modified || Routing::Modified() || NetworkConfig::Modified(); - y2milestone("ret: %1", ret); return ret; } @@ -182,12 +181,14 @@ define void IPv6Init (string key) { - UI::ChangeWidget (`id (key), `CurrentButton, Lan::ipv6?"enable":"disable"); + UI::ChangeWidget (`id (`ipv6), `Value, Lan::ipv6 ? true : false); } define void IPv6Store (string key, map event) { - if ((string) UI::QueryWidget (`id (key), `CurrentButton)=="enable") Lan::SetIPv6(true); - else Lan::SetIPv6(false); + if ((boolean) UI::QueryWidget (`id (`ipv6), `Value)) + Lan::SetIPv6(true); + else + Lan::SetIPv6(false); } /** @@ -338,8 +339,6 @@ } } - - map<string, map<string,any> > wd = $[ "MANAGED": $[ "widget": `radio_buttons, @@ -360,17 +359,11 @@ "store": ManagedStore, ], "IPV6": $[ - "widget": `radio_buttons, - // radio button group label, method of setup - "label": _("IPv6 Support"), - "items": [ - // radio button label - // the user can enable IPv6 - ["enable", _("&Enable")], - // radio button label - // the user can disable IPv6 - ["disable", _("&Disable")], - ], + "widget": `custom, + "custom_widget" : + `Frame ( _("IPv6 Protocol Settings"), + `Left(`CheckBox(`id(`ipv6), _("Enable IPv6"))) + ), "opt": [], "help": help["ipv6"]:"", "init": IPv6Init, @@ -403,7 +396,9 @@ "global" : $[ "header" : _("Global Options"), "contents" : `VBox ( - "MANAGED", "IPV6", + "MANAGED", + `VSpacing(0.5), + "IPV6", `VStretch() ), "widget_names" : ["MANAGED", "IPV6"] @@ -419,8 +414,44 @@ tabs_descr = union(tabs_descr, route_td); tabs_descr = union(tabs_descr, dns_td); +symbol ManagedDialog() { + + map widget_descr = union(wd["MANAGED"]:$[], wd["IPV6"]:$[]); + term contents = `VBox ( + `HSquash( + `VBox( ("MANAGED"), + `VSpacing(0.5), + ("IPV6") + ) + )); + + map functions = $[ + `abort : ReallyAbort, + ]; + + symbol ret = (symbol) CWM::ShowAndRun ( + $[ + "widget_descr": wd, + "contents": contents, + /* Network setup method dialog caption */ + "caption": _("Network Setup Method"), + "back_button" : Label::BackButton (), + "next_button" : Label::AcceptButton (), + // #54027 + "disable_buttons" : (["back_button"]), + "fallback_functions" : functions, + ]); + + // #148485: always show the device overview + if (false && ret == `next && NetworkService::IsManaged ()) + { + ret = `managed; + } + return ret; +} + symbol MainDialog(string init_tab) ``{ -string caption = _("Network Settings"); + string caption = _("Network Settings"); map widget_descr = $[ "tab": CWMTab::CreateWidget($[ "tab_order": ( Stage::normal() ) ? [ "global", "overview", "resolv", "route" ] : ["overview", "resolv", "route"], diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.20/src/modules/Lan.ycp new/yast2-network-2.15.21/src/modules/Lan.ycp --- old/yast2-network-2.15.20/src/modules/Lan.ycp 2007-03-28 10:46:17.000000000 +0200 +++ new/yast2-network-2.15.21/src/modules/Lan.ycp 2007-04-03 13:17:05.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Network card data * Authors: Michal Svec <msvec(a)suse.cz> * - * $Id: Lan.ycp 36863 2007-03-12 10:47:37Z mzugec $ + * $Id: Lan.ycp 37280 2007-04-03 11:17:03Z kmachalkova $ * * Representation of the configuration of network cards. * Input and output routines. @@ -218,6 +218,28 @@ return modified; } +/** + * Function which returns if the settings were modified + * @return boolean settings were modified + */ +global define boolean GetModified () { + return modified; +} +/** + * Function sets internal variable, which indicates, that any + * settings were modified, to "true" + */ +global define void SetModified () { + modified = true; +} +/** + * Function sets internal variable, which indicates, that any + * settings were modified, to "false" + */ +global define void UnsetModified () { + modified = false; +} + // functions for use from autoinstallation global define boolean isAnyInterfaceDown(){ boolean down = false; @@ -442,7 +464,10 @@ } global void SetIPv6(boolean status){ - ipv6=status; + if(ipv6 != status) { + ipv6=status; + SetModified(); + } } void writeIPv6(){ @@ -740,62 +765,60 @@ } /** - * Create a textual summary for the NetworkManager proposal + * Create a textual summary for the general network settings + * proposal (NetworkManager + ipv6) * @return [rich text, links] */ -global define list SummaryNM () { - string status = nil; - string href = nil; - string link = nil; +global define list SummaryGeneral () { + string status_nm = nil; + string status_v6 = nil; + string href_nm = nil; + string href_v6 = nil; + string link_nm = nil; + string link_v6 = nil; + string header_nm = _("Network Mode"); + if (NetworkService::IsManaged ()) { - href = "lan--nm-disable"; + href_nm = "lan--nm-disable"; // network mode: the interfaces are controlled by the user - status = _("User-Controlled Interfaces with the NetworkManager Applet"); + status_nm = _("Interfaces controlled by NetworkManager"); // disable NetworkManager applet - link = Hyperlink (href, _("Disable NetworkManager")); + link_nm = Hyperlink (href_nm, _("Disable NetworkManager")); } else { - href = "lan--nm-enable"; + href_nm = "lan--nm-enable"; // network mode - status = _("Traditional Method without the NetworkManager Applet"); + status_nm = _("Traditional network setup with NetControl - ifup"); // enable NetworkManager applet - link = Hyperlink (href, _("Enable NetworkManager")); + link_nm = Hyperlink (href_nm, _("Enable NetworkManager")); } - string descr = sformat ("<ul><li>%1 (%2)</li></ul>", status, link); - list<string> links = [ href ]; - return [descr, links]; -} -/** - * Create a textual summary for the ipv6 proposal - * @return [rich text, links] - */ -global define list SummaryIPv6 () { - string status = nil; - string href = nil; - string link = nil; if (ipv6) { - href = "ipv6-disable"; - // network mode: the interfaces are controlled by the user - status = _("Enabled Support for IPv6 Protocol"); - // disable NetworkManager applet - link = Hyperlink (href, _("Disable IPv6")); + href_v6 = "ipv6-disable"; + // ipv6 support is enabled + status_v6 = _("Support for IPv6 protocol is enabled"); + // disable ipv6 support + link_v6 = Hyperlink (href_v6, _("Disable IPv6")); } else { - href = "ipv6-enable"; - // network mode - status = _("Disabled Support for IPv6 Protocol"); - // enable NetworkManager applet - link = Hyperlink (href, _("Enable IPv6")); + href_v6 = "ipv6-enable"; + // ipv6 support is disabled + status_v6 = _("Support for IPv6 protocol is disabled"); + // enable ipv6 support + link_v6 = Hyperlink (href_v6, _("Enable IPv6")); } - string descr = sformat ("<ul><li>%1 (%2)</li></ul>", status, link); - list<string> links = [ href ]; + + string descr = sformat ("<ul><li>%1: %2 (%3)</li></ul> + <ul><li>%4 (%5)</li></ul>", header_nm, status_nm, link_nm, + status_v6, link_v6); + list<string> links = [ href_nm, href_v6 ]; return [descr, links]; } + /** * Create an overview table with all configured devices * @return table items @@ -1990,7 +2013,6 @@ return NetworkDevices::HasAliases(dev); } - global define list<map> PrepareForAutoinst() { ReadInstallInf(); @@ -2038,28 +2060,6 @@ } /** - * Function which returns if the settings were modified - * @return boolean settings were modified - */ -global define boolean GetModified () { - return modified; -} -/** - * Function sets internal variable, which indicates, that any - * settings were modified, to "true" - */ -global define void SetModified () { - modified = true; -} -/** - * Function sets internal variable, which indicates, that any - * settings were modified, to "false" - */ -global define void UnsetModified () { - modified = false; -} - -/** * Xen bridging confuses us (#178848) * @return whether xenbr* exists */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.20/src/services/routing.ycp new/yast2-network-2.15.21/src/services/routing.ycp --- old/yast2-network-2.15.20/src/services/routing.ycp 2007-03-27 11:46:54.000000000 +0200 +++ new/yast2-network-2.15.21/src/services/routing.ycp 2007-03-29 14:30:43.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Routing configuration dialogs * Authors: Michal Svec <msvec(a)suse.cz> * - * $Id: routing.ycp 37058 2007-03-21 14:26:30Z mzugec $ + * $Id: routing.ycp 37208 2007-03-29 12:30:42Z kmachalkova $ * * Routing configuration dialogs */ @@ -330,31 +330,31 @@ /** * Main routing dialog - * @param standalone true if not run from another ycp client * @return dialog result */ define any RoutingMainDialog() { -string caption = _("Network Setting Dialog"); - map widget_descr = $[ - "tab": CWMTab::CreateWidget($[ - "tab_order": ["route"], - "tabs": route_td, - "widget_descr": wd_routing, - "initial_tab" : "route", - "tab_help" : "", - ]), + string caption = _("Routing Configuration"); + + map functions = $[ + "init" : initRouting, + "store" : storeRouting, + `abort : ReallyAbort, ]; - term contents = `VBox( "tab"); - list<map <string, any> > w = CWM::CreateWidgets (["tab"], (map <string, map <string, any> >)widget_descr); - string help = CWM::MergeHelps(w); - contents = CWM::PrepareDialog(contents, w); + term contents = `VBox("ROUTING"); - Wizard::SetContentsButtons(caption, contents, help, Label::NextButton (), Label::FinishButton ()); Wizard::HideBackButton(); - symbol ret = CWM::Run(w, $[`abort:ReallyAbort ]); + symbol ret = CWM::ShowAndRun ( + $[ + "widget_descr" : wd_routing, + "contents" : contents, + "caption" : caption, + "back_button" : Label::BackButton(), + "next_button" : Label::NextButton(), + "fallback_functions" : functions, + ]); return ret; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.20/VERSION new/yast2-network-2.15.21/VERSION --- old/yast2-network-2.15.20/VERSION 2007-03-28 17:03:27.000000000 +0200 +++ new/yast2-network-2.15.21/VERSION 2007-04-03 13:47:41.000000000 +0200 @@ -1 +1 @@ -2.15.20 +2.15.21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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
by root＠Hilbert.suse.de 03 Apr '07

03 Apr '07

Hello community, here is the log from the commit of package yast2 checked in at Tue Apr 3 20:33:38 CEST 2007. -------- --- yast2/yast2.changes 2007-03-28 17:10:05.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2/yast2.changes 2007-04-02 14:48:50.443183000 +0200 @@ -1,0 +2,30 @@ +Mon Apr 2 14:15:53 CEST 2007 - jsuchome(a)suse.cz + +- fixed restarting after Patch CD update (#259825) +- 2.15.23 + +------------------------------------------------------------------- +Mon Apr 2 14:11:12 CEST 2007 - lslezak(a)suse.cz + +- register new callbacks Pkg::CallbackSourceCreateInit/Destroy() + and Pkg::CallbackSourceReportInit/Destroy() (#251726) + +------------------------------------------------------------------- +Mon Apr 2 10:59:49 CEST 2007 - locilka(a)suse.cz + +- Changed Firewall proposal to be unified with other network + proposals, e.g., "Firewall is enabled (disable)" (#259778). + +------------------------------------------------------------------- +Fri Mar 30 08:23:46 CEST 2007 - locilka(a)suse.cz + +- SCR agent proc_meminfo.scr moved from yast2-storage to yast2 + +------------------------------------------------------------------- +Thu Mar 29 15:45:49 CEST 2007 - locilka(a)suse.cz + +- Added new WorkflowManager testsuite +- Added some debugging functions into WorkflowManager +- Changed ProductControl for easier testing + +------------------------------------------------------------------- Old: ---- yast2-2.15.22.tar.bz2 New: ---- yast2-2.15.23.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.cZ6048/_old 2007-04-03 20:32:11.000000000 +0200 +++ /var/tmp/diff_new_pack.cZ6048/_new 2007-04-03 20:32:11.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2 (Version 2.15.22) +# spec file for package yast2 (Version 2.15.23) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,18 +11,18 @@ # norootforbuild Name: yast2 -Version: 2.15.22 +Version: 2.15.23 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-2.15.22.tar.bz2 +Source0: yast2-2.15.23.tar.bz2 prefix: /usr BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-pkg-bindings yast2-testsuite # SCR::RegisterNewAgents() Requires: yast2-core >= 2.15.4 -# Pkg::Callback*ScanDb() -Requires: yast2-pkg-bindings >= 2.15.10 +# Pkg::CallbackSourceCreateInit/Destroy() +Requires: yast2-pkg-bindings >= 2.15.13 Requires: yast2_ui yast2_theme # For Cron Agent, Module Requires: perl-Config-Crontab @@ -101,7 +101,7 @@ Steffen Winterfeldt <snwint(a)suse.de> %prep -%setup -n yast2-2.15.22 +%setup -n yast2-2.15.23 %build %{prefix}/bin/y2tool y2autoconf @@ -209,6 +209,21 @@ %doc %{prefix}/share/doc/packages/yast2/wizard %changelog +* Mon Apr 02 2007 - jsuchome(a)suse.cz +- fixed restarting after Patch CD update (#259825) +- 2.15.23 +* Mon Apr 02 2007 - lslezak(a)suse.cz +- register new callbacks Pkg::CallbackSourceCreateInit/Destroy() + and Pkg::CallbackSourceReportInit/Destroy() (#251726) +* Mon Apr 02 2007 - locilka(a)suse.cz +- Changed Firewall proposal to be unified with other network + proposals, e.g., "Firewall is enabled (disable)" (#259778). +* Fri Mar 30 2007 - locilka(a)suse.cz +- SCR agent proc_meminfo.scr moved from yast2-storage to yast2 +* Thu Mar 29 2007 - locilka(a)suse.cz +- Added new WorkflowManager testsuite +- Added some debugging functions into WorkflowManager +- Changed ProductControl for easier testing * Wed Mar 28 2007 - locilka(a)suse.cz - Some testsuites have been moved from yast2-packager to yast2 - 2.15.22 ++++++ yast2-2.15.22.tar.bz2 -> yast2-2.15.23.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.15.22/configure new/yast2-2.15.23/configure --- old/yast2-2.15.22/configure 2007-03-28 16:22:59.000000000 +0200 +++ new/yast2-2.15.23/configure 2007-04-02 14:43:13.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 2.15.21. +# Generated by GNU Autoconf 2.60 for yast2 2.15.23. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -559,8 +559,8 @@ # Identity of this package. PACKAGE_NAME='yast2' PACKAGE_TARNAME='yast2' -PACKAGE_VERSION='2.15.21' -PACKAGE_STRING='yast2 2.15.21' +PACKAGE_VERSION='2.15.23' +PACKAGE_STRING='yast2 2.15.23' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1183,7 +1183,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 2.15.21 to adapt to many kinds of systems. +\`configure' configures yast2 2.15.23 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1254,7 +1254,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2 2.15.21:";; + short | recursive ) echo "Configuration of yast2 2.15.23:";; esac cat <<\_ACEOF @@ -1332,7 +1332,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2 configure 2.15.21 +yast2 configure 2.15.23 generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1346,7 +1346,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 $as_me 2.15.21, which was +It was created by yast2 $as_me 2.15.23, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -2147,7 +2147,7 @@ # Define the identity of the package. PACKAGE='yast2' - VERSION='2.15.21' + VERSION='2.15.23' cat >>confdefs.h <<_ACEOF @@ -2374,7 +2374,7 @@ -VERSION="2.15.21" +VERSION="2.15.23" RPMNAME="yast2" MAINTAINER="Jiri Srain <jsrain(a)suse.cz>" @@ -3366,7 +3366,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2 $as_me 2.15.21, which was +This file was extended by yast2 $as_me 2.15.23, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3409,7 +3409,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2 config.status 2.15.21 +yast2 config.status 2.15.23 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-2.15.22/configure.in new/yast2-2.15.23/configure.in --- old/yast2-2.15.22/configure.in 2007-03-28 16:22:54.000000000 +0200 +++ new/yast2-2.15.23/configure.in 2007-04-02 14:43:08.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, 2.15.21, http://bugs.opensuse.org/, yast2) +AC_INIT(yast2, 2.15.23, http://bugs.opensuse.org/, yast2) 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.21" +VERSION="2.15.23" RPMNAME="yast2" MAINTAINER="Jiri Srain <jsrain(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.15.22/library/agents/proc_meminfo.scr new/yast2-2.15.23/library/agents/proc_meminfo.scr --- old/yast2-2.15.22/library/agents/proc_meminfo.scr 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-2.15.23/library/agents/proc_meminfo.scr 2007-04-02 13:54:49.000000000 +0200 @@ -0,0 +1,68 @@ +/** + * File: + * proc_meminfo.scr + * Summary: + * SCR Agent for reading /proc/meminfo + * Access: + * read-only + * Authors: + * Unknown <yast2-hacker(a)suse.de> + * See: + * anyagent + * libscr + * Example: + * Read (.proc.meminfo) + * -> $[ + * "active":804312, + * "buffers":71292, + * "cached":254736, + * "highfree":0, + * "hightotal":0, + * "inactive":140676, + * "lowfree":9960, + * "lowtotal":1028088, + * "memfree":9960, + * "memtotal":1028088, + * "swapcached":30172, + * "swapfree":2037508, + * "swaptotal":2104472 + * ] + * + * $Id: proc_meminfo.scr 37214 2007-03-30 07:48:08Z locilka $ + * + * Returns a map. Keys for the map are: "active", "buffers", "cached", + * "highfree", "hightotal", "inactive", "lowfree", "lowtotal", "memfree", + * "memtotal", "swapcached", "swapfree", and "swaptotal". + * Values for all but "mem", "swap" are the respective size in kB. + */ +.proc.meminfo + +`ag_anyagent( + `Description ( + (`File("/proc/meminfo")), // real file name + "#\n", // Comment + true, // read-only + (`Tuple ( + `Choice ( + [" ", `Sequence (`Whitespace(),"total",`String("^\n"))], + ["Mem:", `mem(`Tuple (`Whitespace(), `total(`Number()), `Whitespace(), `used(`Number()), `Whitespace(), `free(`Number()), `Whitespace(), `shared(`Number()), `Whitespace(), `buffers(`Number()), `Whitespace(), `cached(`Number())))], + ["Swap:", `swap(`Tuple (`Whitespace(), `total(`Number()), `Whitespace(), `used(`Number()), `Whitespace(), `free(`Number())))], + ["MemTotal:", `Sequence (`Whitespace(), `memtotal(`Number()), `String("^\n"))], + ["MemFree:", `Sequence (`Whitespace(), `memfree(`Number()), `String("^\n"))], + ["MemShared:", `Sequence (`Whitespace(), `memshared(`Number()), `String("^\n"))], + ["Buffers:", `Sequence (`Whitespace(), `buffers(`Number()), `String("^\n"))], + ["Cached:", `Sequence (`Whitespace(), `cached(`Number()), `String("^\n"))], + ["SwapCached:", `Sequence (`Whitespace(), `swapcached(`Number()), `String("^\n"))], + ["Active:", `Sequence (`Whitespace(), `active(`Number()), `String("^\n"))], + ["Inactive:", `Sequence (`Whitespace(), `inactive(`Number()), `String("^\n"))], + ["HighTotal:", `Sequence (`Whitespace(), `hightotal(`Number()), `String("^\n"))], + ["HighFree:", `Sequence (`Whitespace(), `highfree(`Number()), `String("^\n"))], + ["LowTotal:", `Sequence (`Whitespace(), `lowtotal(`Number()), `String("^\n"))], + ["LowFree:", `Sequence (`Whitespace(), `lowfree(`Number()), `String("^\n"))], + ["SwapTotal:", `Sequence (`Whitespace(), `swaptotal(`Number()), `String("^\n"))], + ["SwapFree:", `Sequence (`Whitespace(), `swapfree(`Number()), `String("^\n"))] + ), + `Continue ("\n") + )) + ) +) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.15.22/library/control/src/ProductControl.ycp new/yast2-2.15.23/library/control/src/ProductControl.ycp --- old/yast2-2.15.22/library/control/src/ProductControl.ycp 2007-02-28 15:19:48.000000000 +0100 +++ new/yast2-2.15.23/library/control/src/ProductControl.ycp 2007-04-02 13:54:48.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Product Control routines * Authors: Anas Nashif <nashif(a)suse.de> * - * $Id: ProductControl.ycp 36558 2007-02-28 12:33:53Z lslezak $ + * $Id: ProductControl.ycp 37209 2007-03-29 13:47:18Z locilka $ */ { textdomain "base"; @@ -21,7 +21,7 @@ import "Report"; import "Hooks"; import "Popup"; - +import "FileUtils"; // The complete parsed control file global map productControl = $[]; @@ -722,11 +722,10 @@ /** * Return proposal Label */ -global map getProposalProperties( string stage, string mode, string proptype -) -{ - list<map> proposals = getMatchingProposal(stage, mode, proptype); - map proposal = proposals[0]:$[]; +global map getProposalProperties (string stage, string mode, string proptype) { + list <map> got_proposals = getMatchingProposal(stage, mode, proptype); + map proposal = got_proposals[0]:$[]; + if (haskey (proposal, "proposal_tabs")) { string text_domain = productControl["textdomain"]:"control"; @@ -738,6 +737,7 @@ return tab; }); } + return proposal; } @@ -764,8 +764,7 @@ * Initialize Product Control * @return boolean True on success */ -global define boolean Init() -{ +global define boolean Init() { boolean ret = false; current_control_file = ""; @@ -777,29 +776,27 @@ packaged_control_file // /usr/share/YaST2/control/control.xml ]; - if ( custom_control_file != "") - { - order=prepend(order, custom_control_file); + if ( custom_control_file != "") { + order=prepend (order, custom_control_file); } - y2milestone("Candidates: %1", order ); - foreach(string cf, order, - { - if ((integer)SCR::Read( .target.size, cf )>0 - && current_control_file == "") - { - current_control_file = cf; + y2milestone ("Candidates: %1", order); + foreach(string control_file, order, { + if (FileUtils::Exists (control_file) && current_control_file == "") { + current_control_file = control_file; + break; } }); - if (current_control_file == "") - { - y2error("Control file not found"); + if (current_control_file == "") { + y2error ("No control file found"); + return false; } - y2milestone("Reading control file: %1", current_control_file ); - ReadControlFile( current_control_file ); + y2milestone ("Reading control file: %1", current_control_file); + ReadControlFile (current_control_file); + return (current_control_file != ""); } @@ -807,21 +804,19 @@ * Re-translate static part of wizard dialog and other predefined messages * after language change */ -void retranslateWizardDialog() - { - y2milestone( "Retranslating messages 1" ); +void retranslateWizardDialog() { + y2milestone ("Retranslating messages, redrawing wizard steps"); // Make sure the labels for default function keys are retranslated, too. // Using Label::DefaultFunctionKeyMap() from Label module. UI::SetFunctionKeys( Label::DefaultFunctionKeyMap() ); // Activate language changes on static part of wizard dialog - ProductControl::RetranslateWizardSteps(); Wizard::RetranslateButtons(); Wizard::SetFocusToNextButton(); return; - } +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.15.22/library/control/src/WorkflowManager.ycp new/yast2-2.15.23/library/control/src/WorkflowManager.ycp --- old/yast2-2.15.22/library/control/src/WorkflowManager.ycp 2007-03-28 17:02:44.000000000 +0200 +++ new/yast2-2.15.23/library/control/src/WorkflowManager.ycp 2007-04-02 13:54:48.000000000 +0200 @@ -476,7 +476,7 @@ if (FileUtils::Exists (used_filename)) { y2milestone ("Removing cached file '%1': %2", used_filename, - (boolean) SCR::Execute (.target.remove, used_filename) + SCR::Execute (.target.remove, used_filename) ); } } @@ -1026,11 +1026,6 @@ return false; } - if (! RedrawWizardSteps ()) { - y2error ("Redrawing the wizard steps failed"); - return false; - } - if (! UpdateInstFinish (update_file["update", "inst_finish"]:$[])) { y2error ("Adding inst_finish steps failed"); return false; @@ -1105,4 +1100,27 @@ global boolean HaveAdditionalWorkflows () { return (size (GetAllUsedControlFiles()) >= 0); } + + /** + * Returns the current settings used by WorkflowManager. + * This function is just for debugging purpose. + * + * @return map <string, any> of current settings + * @struct [ + * "workflows" : ... + * "proposals" : ... + * "inst_finish" : ... + * "clone_modules" : ... + * "unmerged_changes" : ... + * ]; + */ + global map <string, any> DumpCurrentSettings () { + return $[ + "workflows" : ProductControl::workflows, + "proposals" : ProductControl::proposals, + "inst_finish" : ProductControl::inst_finish, + "clone_modules" : ProductControl::clone_modules, + "unmerged_changes" : unmerged_changes, + ]; + } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.15.22/library/control/testsuite/tests/WorkflowManager.out new/yast2-2.15.23/library/control/testsuite/tests/WorkflowManager.out --- old/yast2-2.15.22/library/control/testsuite/tests/WorkflowManager.out 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-2.15.23/library/control/testsuite/tests/WorkflowManager.out 2007-04-02 13:54:48.000000000 +0200 @@ -0,0 +1,20 @@ +Return nil +Dump +Dump Adding new Add-On product +Return true +Return ["/tmp/additional-control-files/3:__AddOnProduct-ControlFile__.xml"] +Dump +Dump Adding another Add-On product +Return true +Return ["/tmp/additional-control-files/3:__AddOnProduct-ControlFile__.xml", "/tmp/additional-control-files/12:__AddOnProduct-ControlFile__.xml"] +Dump +Dump Removing the first Add-On product +Execute .target.remove "/tmp/additional-control-files/3:__AddOnProduct-ControlFile__.xml" 0 +Return true +Return ["/tmp/additional-control-files/12:__AddOnProduct-ControlFile__.xml"] +Dump +Dump Removing the first Add-On product +Return true +Dump +Dump Current Settings +Return $["clone_modules":[], "inst_finish":[], "proposals":[$["archs":"", "mode":"installation", "name":"initial", "proposal_modules":["hwinfo", "keyboard", "mouse", "partitions", "software", "bootloader", "timezone", "language", "runlevel"], "proposal_tabs":[$["label":"Overview", "proposal_modules":["partitions", "software_simple", "language_simple"]], $["label":"Expert", "proposal_modules":["hwinfo", "keyboard", "mouse", "partitions", "software", "bootloader", "timezone", "language", "runlevel"]]], "stage":"initial"], $["archs":"", "mode":"demo", "name":"initial", "proposal_modules":["hwinfo", "keyboard", "mouse", "partitions", "software", "bootloader", "timezone", "language", "runlevel"], "proposal_tabs":[$["label":"Overview", "proposal_modules":["partitions", "software_simple", "language_simple"]], $["label":"Expert", "proposal_modules":["hwinfo", "keyboard", "mouse", "partitions", "software", "bootloader", "timezone", "language", "runlevel"]]], "stage":"initial"], $["archs":"", "mode":"autoinstallation", "name":"initial", "proposal_modules":["hwinfo", "keyboard", "mouse", "partitions", "software", "bootloader", "timezone", "language", "runlevel"], "proposal_tabs":[$["label":"Overview", "proposal_modules":["partitions", "software_simple", "language_simple"]], $["label":"Expert", "proposal_modules":["hwinfo", "keyboard", "mouse", "partitions", "software", "bootloader", "timezone", "language", "runlevel"]]], "stage":"initial"], $["archs":"", "mode":"", "name":"network", "proposal_modules":[$["name":"lan", "presentation_order":"20"], $["name":"dsl", "presentation_order":"30"], $["name":"isdn", "presentation_order":"40"], $["name":"modem", "presentation_order":"50"], $["name":"remote", "presentation_order":"60"], $["name":"firewall", "presentation_order":"10"], $["name":"proxy", "presentation_order":"70"]], "stage":"continue"], $["archs":"", "mode":"", "name":"network", "proposal_modules":[$["name":"lan", "presentation_order":"20"], $["name":"dsl", "presentation_order":"30"], $["name":"isdn", "presentation_order":"40"], $["name":"modem", "presentation_order":"50"], $["name":"remote", "presentation_order":"60"], $["name":"firewall", "presentation_order":"10"], $["name":"proxy", "presentation_order":"70"]], "stage":"normal"]], "unmerged_changes":false, "workflows":[$["defaults":$["archs":"i386"], "label":"Preparation", "mode":"installation", "modules":[$["arguments":$["first_run":"yes"], "enable_back":"no", "enable_next":"yes", "label":"Language", "name":"language", "retranslate":true], $["label":"Perform Installation", "name":"finish"]], "stage":"initial"], $["defaults":$["archs":"x86_64"], "label":"Preparation", "mode":"installation", "modules":[$["arguments":$["first_run":"yes"], "enable_back":"no", "enable_next":"yes", "label":"Language", "name":"language", "retranslate":true], $["label":"Perform Installation", "name":"finish"]], "stage":"initial"], $["defaults":$["archs":"i386"], "label":"Preparation", "mode":"update", "modules":[$["arguments":$["first_run":"yes"], "enable_back":"no", "enable_next":"yes", "label":"Language", "name":"language", "retranslate":true], $["label":"Perform Installation", "name":"finish"]], "stage":"initial"], $["defaults":$["archs":"x86_64"], "label":"Preparation", "mode":"update", "modules":[$["arguments":$["first_run":"yes"], "enable_back":"no", "enable_next":"yes", "label":"Language", "name":"language", "retranslate":true], $["label":"Perform Installation", "name":"finish"]], "stage":"initial"]]] diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.15.22/library/control/testsuite/tests/WorkflowManager.ycp new/yast2-2.15.23/library/control/testsuite/tests/WorkflowManager.ycp --- old/yast2-2.15.22/library/control/testsuite/tests/WorkflowManager.ycp 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-2.15.23/library/control/testsuite/tests/WorkflowManager.ycp 2007-04-02 13:54:48.000000000 +0200 @@ -0,0 +1,56 @@ +{ + +// testedfiles: WorkflowManager.ycp + +include "testsuite.ycp"; + +map READ = $[ + "target" : $[ + "size" : 0, + ], +]; + +map WRITE = $[]; + +map EXEC = $[]; + +TESTSUITE_INIT([READ, WRITE, EXEC], nil); + +import "WorkflowManager"; +import "ProductControl"; + +// init --> +ProductControl::workflows = [$["defaults":$["archs":"i386"],"label":"Preparation","mode":"installation","modules":[$["arguments":$["first_run":"yes"], "enable_back":"no", "enable_next":"yes", "label":"Language", "name":"language", "retranslate":true], $["label":"Perform Installation", "name":"finish"]], "stage":"initial"], $["defaults":$["archs":"x86_64"], "label":"Preparation", "mode":"installation", "modules":[$["arguments":$["first_run":"yes"], "enable_back":"no", "enable_next":"yes", "label":"Language", "name":"language", "retranslate":true], $["label":"Perform Installation", "name":"finish"]], "stage":"initial"], $["defaults":$["archs":"i386"], "label":"Preparation", "mode":"update", "modules":[$["arguments":$["first_run":"yes"], "enable_back":"no", "enable_next":"yes", "label":"Language", "name":"language", "retranslate":true], $["label":"Perform Installation", "name":"finish"]], "stage":"initial"], $["defaults":$["archs":"x86_64"], "label":"Preparation", "mode":"update", "modules":[$["arguments":$["first_run":"yes"], "enable_back":"no", "enable_next":"yes", "label":"Language", "name":"language", "retranslate":true], $["label":"Perform Installation", "name":"finish"]],"stage":"initial"]]; +WorkflowManager::PrepareSystemWorkflows(); + +ProductControl::proposals = [$["archs":"", "mode":"installation", "name":"initial", "proposal_modules":["hwinfo", "keyboard", "mouse", "partitions", "software", "bootloader", "timezone", "language", "runlevel"], "proposal_tabs":[$["label":"Overview", "proposal_modules":["partitions", "software_simple", "language_simple"]], $["label":"Expert", "proposal_modules":["hwinfo", "keyboard", "mouse", "partitions", "software", "bootloader", "timezone", "language", "runlevel"]]], "stage":"initial"], $["archs":"", "mode":"demo", "name":"initial", "proposal_modules":["hwinfo", "keyboard", "mouse", "partitions", "software", "bootloader", "timezone", "language", "runlevel"], "proposal_tabs":[$["label":"Overview", "proposal_modules":["partitions", "software_simple", "language_simple"]], $["label":"Expert", "proposal_modules":["hwinfo", "keyboard", "mouse", "partitions", "software", "bootloader", "timezone", "language", "runlevel"]]], "stage":"initial"], $["archs":"", "mode":"autoinstallation", "name":"initial", "proposal_modules":["hwinfo", "keyboard", "mouse", "partitions", "software", "bootloader", "timezone", "language", "runlevel"], "proposal_tabs":[$["label":"Overview", "proposal_modules":["partitions", "software_simple", "language_simple"]], $["label":"Expert", "proposal_modules":["hwinfo", "keyboard", "mouse", "partitions", "software", "bootloader", "timezone", "language", "runlevel"]]], "stage":"initial"], $["archs":"", "mode":"", "name":"network", "proposal_modules":[$["name":"lan", "presentation_order":"20"], $["name":"dsl", "presentation_order":"30"], $["name":"isdn", "presentation_order":"40"], $["name":"modem", "presentation_order":"50"], $["name":"remote", "presentation_order":"60"], $["name":"firewall", "presentation_order":"10"], $["name":"proxy", "presentation_order":"70"]], "stage":"continue"], $["archs":"", "mode":"", "name":"network", "proposal_modules":[$["name":"lan", "presentation_order":"20"], $["name":"dsl", "presentation_order":"30"], $["name":"isdn", "presentation_order":"40"], $["name":"modem", "presentation_order":"50"], $["name":"remote", "presentation_order":"60"], $["name":"firewall", "presentation_order":"10"], $["name":"proxy", "presentation_order":"70"]], "stage":"normal"]]; +WorkflowManager::PrepareSystemProposals(); +// init <-- + + +TEST (``(WorkflowManager::SetBaseWorkflow (false)), [], nil); + +DUMP (""); +DUMP ("Adding new Add-On product"); +TEST (``(WorkflowManager::AddWorkflow (`addon, 3, "")), [], nil); +TEST (``(WorkflowManager::GetAllUsedControlFiles ()), [], nil); + +DUMP (""); +DUMP ("Adding another Add-On product"); +TEST (``(WorkflowManager::AddWorkflow (`addon, 12, "")), [], nil); +TEST (``(WorkflowManager::GetAllUsedControlFiles ()), [], nil); + +DUMP (""); +DUMP ("Removing the first Add-On product"); +TEST (``(WorkflowManager::RemoveWorkflow (`addon, 3, "")), [], nil); +TEST (``(WorkflowManager::GetAllUsedControlFiles ()), [], nil); + +DUMP (""); +DUMP ("Removing the first Add-On product"); +TEST (``(WorkflowManager::MergeWorkflows ()), [READ, WRITE, EXEC], nil); + +DUMP (""); +DUMP ("Current Settings"); +TEST (``(WorkflowManager::DumpCurrentSettings ()), [], nil); + +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.15.22/library/modules/Version.ycp new/yast2-2.15.23/library/modules/Version.ycp --- old/yast2-2.15.22/library/modules/Version.ycp 2007-03-28 17:12:01.000000000 +0200 +++ new/yast2-2.15.23/library/modules/Version.ycp 2007-04-02 14:43:33.000000000 +0200 @@ -20,7 +20,7 @@ /** * Version of the yast2 package */ -global string yast2 = "2.15.22"; +global string yast2 = "2.15.23"; /* EOF */ } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.15.22/library/network/src/SuSEFirewallProposal.ycp new/yast2-2.15.23/library/network/src/SuSEFirewallProposal.ycp --- old/yast2-2.15.22/library/network/src/SuSEFirewallProposal.ycp 2007-03-06 13:54:32.000000000 +0100 +++ new/yast2-2.15.23/library/network/src/SuSEFirewallProposal.ycp 2007-04-02 13:54:49.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Functional interface for SuSEFirewall installation proposal * Authors: Lukas Ocilka <locilka(a)suse.cz> * - * $Id: SuSEFirewallProposal.ycp 36740 2007-03-06 12:54:30Z locilka $ + * $Id: SuSEFirewallProposal.ycp 37245 2007-04-02 09:10:55Z locilka $ * * This module provides a functional API for Installation proposal of SuSEfirewall2 */ @@ -389,15 +389,15 @@ boolean firewall_is_enabled = (SuSEFirewall::GetEnableService() == true); output = output + "<ul>\n"; - output = output + (firewall_is_enabled ? - // TRANSLATORS: Proposal informative text "Firewall is enabled" with link around + output = output + "<li>" + (firewall_is_enabled ? + // TRANSLATORS: Proposal informative text "Firewall is enabled (disable)" with link around // IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text - _("Firewall is <a href=\"firewall--disable_firewall_in_proposal\">enabled</a>") + _("Firewall is enabled (<a href=\"firewall--disable_firewall_in_proposal\">disable</a>)") : - // TRANSLATORS: Proposal informative text "Firewall is disabled" with link around + // TRANSLATORS: Proposal informative text "Firewall is disabled (enable)" with link around // IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text - _("Firewall is <a href=\"firewall--enable_firewall_in_proposal\">disabled</a>") - ); + _("Firewall is disabled (<a href=\"firewall--enable_firewall_in_proposal\">enable</a>)") + ) + "</li>\n"; if (firewall_is_enabled) { // Any enabled SSH means SSH-is-enabled @@ -417,15 +417,15 @@ } }); - output = output + "<br>" + (is_ssh_enabled ? + output = output + "<li>" + (is_ssh_enabled ? // TRANSLATORS: Network proposal informative text with link around // IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text - _("SSH port is <a href=\"firewall--disable_ssh_in_proposal\">open</a>") + _("SSH port is open (<a href=\"firewall--disable_ssh_in_proposal\">close</a>)") : // TRANSLATORS: Network proposal informative text with link around // IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text - _("SSH port is <a href=\"firewall--enable_ssh_in_proposal\">blocked</a>") - ); + _("SSH port is blocked (<a href=\"firewall--enable_ssh_in_proposal\">open</a>)") + ) + "</li>\n"; // No known interfaces, but 'any' is supported // and ssh is enabled there @@ -436,7 +436,7 @@ is_ssh_enabled = true; // TRANSLATORS: Network proposal informative text with link around // IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text - output = output + "<br>" + _("SSH port is <a href=\"firewall--disable_ssh_in_proposal\">open</a>, but there are still no network interfaces configured"); + output = output + "<li>" + _("SSH port is open (<a href=\"firewall--disable_ssh_in_proposal\">close</a>), but there are still no network interfaces configured") + "</li>"; } y2milestone("SSH is " + (is_ssh_enabled ? "":"not ") + "enabled"); @@ -458,15 +458,15 @@ } y2milestone("VNC port is " + (is_vnc_enabled ? "open":"blocked") + " in the firewall"); - output = output + "<br>" + (is_vnc_enabled ? + output = output + "<li>" + (is_vnc_enabled ? // TRANSLATORS: Network proposal informative text "Remote Administration (VNC) is enabled" with link around // IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text - _("Remote Administration (VNC) ports are <a href=\"firewall--disable_vnc_in_proposal\">open</a>") + _("Remote Administration (VNC) ports are open (<a href=\"firewall--disable_vnc_in_proposal\">close</a>)") : // TRANSLATORS: Network proposal informative text "Remote Administration (VNC) is disabled" with link around // IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text - _("Remote Administration (VNC) ports are <a href=\"firewall--enable_vnc_in_proposal\">blocked</a>") - ); + _("Remote Administration (VNC) ports are blocked (<a href=\"firewall--enable_vnc_in_proposal\">open</a>)") + ) + "</li>\n"; if (!is_vnc_enabled) // TRANSLATORS: This is a warning message. Installation over VNC without VNC allowed on firewall diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.15.22/library/packages/src/PackageCallbacksInit.ycp new/yast2-2.15.23/library/packages/src/PackageCallbacksInit.ycp --- old/yast2-2.15.22/library/packages/src/PackageCallbacksInit.ycp 2007-02-16 09:06:20.000000000 +0100 +++ new/yast2-2.15.23/library/packages/src/PackageCallbacksInit.ycp 2007-04-02 14:14:05.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Initialize packager callbacks * Authors: Jiri Srain <jsrain(a)suse.cz> * - * $Id: PackageCallbacksInit.ycp 36165 2007-02-15 06:48:08Z lslezak $ + * $Id: PackageCallbacksInit.ycp 37248 2007-04-02 12:14:01Z lslezak $ * * This module is used to initialize package manager callbacks */ @@ -82,6 +82,8 @@ Pkg::CallbackSourceCreateProgress("PackageCallbacks::SourceCreateProgress"); Pkg::CallbackSourceCreateError("PackageCallbacks::SourceCreateError"); Pkg::CallbackSourceCreateEnd("PackageCallbacks::SourceCreateEnd"); + Pkg::CallbackSourceCreateInit("PackageCallbacks::SourceCreateInit"); + Pkg::CallbackSourceCreateDestroy("PackageCallbacks::SourceCreateDestroy"); // source probing callbacks Pkg::CallbackSourceProbeStart("PackageCallbacks::SourceProbeStart"); @@ -96,6 +98,8 @@ Pkg::CallbackSourceReportProgress("PackageCallbacks::SourceReportProgress"); Pkg::CallbackSourceReportError("PackageCallbacks::SourceReportError"); Pkg::CallbackSourceReportEnd("PackageCallbacks::SourceReportEnd"); + Pkg::CallbackSourceReportInit("PackageCallbacks::SourceReportInit"); + Pkg::CallbackSourceReportDestroy("PackageCallbacks::SourceReportDestroy"); // @see bugzilla #183821 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.15.22/scripts/yast2 new/yast2-2.15.23/scripts/yast2 --- old/yast2-2.15.22/scripts/yast2 2007-03-23 13:36:03.000000000 +0100 +++ new/yast2-2.15.23/scripts/yast2 2007-04-02 14:42:32.000000000 +0200 @@ -269,7 +269,6 @@ fi done else - while true ; do # Transform every argument into a ycp string, that is surround all # args by ("..."). args may contain spaces. a=("$@") @@ -277,6 +276,7 @@ c=("${b[@]/%/\")}") set -- "${c[@]}" + while true ; do $ybindir/y2base "$module" "$@" ncurses $NCTHREADS if [ ! $module == "online_update" -o ! -e "/var/lib/YaST2/selected_patches.ycp" ] ; then break @@ -305,7 +305,6 @@ $y2ccbin $Y2QT_ARGS "$@" else - while true ; do # Special case: "sw_single" needs a lot of screen space - # always start it in full screen mode. # @@ -333,6 +332,7 @@ c=("${b[@]/%/\")}") set -- "${c[@]}" + while true ; do $ybindir/y2base $module "$@" "$SELECTED_GUI" $Y2_GEOMETRY $Y2QT_ARGS if [ ! $module == "online_update" -o ! -e "/var/lib/YaST2/selected_patches.ycp" ] ; then break diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.15.22/VERSION new/yast2-2.15.23/VERSION --- old/yast2-2.15.22/VERSION 2007-03-28 17:09:31.000000000 +0200 +++ new/yast2-2.15.23/VERSION 2007-04-02 14:42:32.000000000 +0200 @@ -1 +1 @@ -2.15.22 +2.15.23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-trans-wa
by root＠Hilbert.suse.de 03 Apr '07

03 Apr '07

Hello community, here is the log from the commit of package yast2-trans-wa checked in at Tue Apr 3 20:17:52 CEST 2007. -------- --- yast2-trans-wa/yast2-trans-wa.changes 2007-03-23 10:46:44.000000000 +0100 +++ /mounts/work_src_done/NOARCH/yast2-trans-wa/yast2-trans-wa.changes 2007-04-02 12:40:14.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Apr 2 12:40:14 2007 - ke(a)suse.de + +- Update to version 2.15.1. + +------------------------------------------------------------------------ Old: ---- yast2-trans-wa-2.13.3.tar.bz2 New: ---- yast2-trans-wa-2.15.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-trans-wa.spec ++++++ --- /var/tmp/diff_new_pack.D20265/_old 2007-04-03 20:15:30.000000000 +0200 +++ /var/tmp/diff_new_pack.D20265/_new 2007-04-03 20:15:30.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-trans-wa (Version 2.13.3) +# spec file for package yast2-trans-wa (Version 2.15.1) # # 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-trans-wa -Version: 2.13.3 +Version: 2.15.1 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-trans-wa-2.13.3.tar.bz2 +Source0: yast2-trans-wa-2.15.1.tar.bz2 prefix: /usr Provides: locale(yast2:wa) BuildRequires: pkgconfig yast2-devtools @@ -31,7 +31,7 @@ %prep -%setup -n yast2-trans-wa-2.13.3 +%setup -n yast2-trans-wa-2.15.1 %build autoreconf --force --install @@ -63,6 +63,8 @@ /usr/share/YaST2/locale %changelog +* Mon Apr 02 2007 - ke(a)suse.de +- Update to version 2.15.1. * Fri Mar 23 2007 - ke(a)suse.de - Update to version 2.13.3. * Mon Feb 19 2007 - ke(a)suse.de ++++++ yast2-trans-wa-2.13.3.tar.bz2 -> yast2-trans-wa-2.15.1.tar.bz2 ++++++ ++++ 5917 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