August 2010 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r62462 - /trunk/installation/control/control.openSUSE.xml
by coolo＠svn2.opensuse.org 31 Aug '10

31 Aug '10

Author: coolo Date: Tue Aug 31 14:00:04 2010 New Revision: 62462 URL: http://svn.opensuse.org/viewcvs/yast?rev=62462&view=rev Log: change 11.3 urls to 11.4 Modified: trunk/installation/control/control.openSUSE.xml Modified: trunk/installation/control/control.openSUSE.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.ope… ============================================================================== --- trunk/installation/control/control.openSUSE.xml (original) +++ trunk/installation/control/control.openSUSE.xml Tue Aug 31 14:00:04 2010 @@ -198,9 +198,9 @@ <extra_urls config:type="list">  <extra_url> - <baseurl>http://download.opensuse.org/update/11.3/</baseurl> + <baseurl>http://download.opensuse.org/update/11.4/</baseurl> <alias>repo-update</alias> - <name>openSUSE-11.3-Update</name> + <name>openSUSE-11.4-Update</name> <prod_dir>/</prod_dir> <enabled config:type="boolean">true</enabled> <autorefresh config:type="boolean">true</autorefresh> @@ -209,36 +209,36 @@  <extra_url> - <baseurl>http://download.opensuse.org/distribution/11.3/repo/oss/</baseurl> + <baseurl>http://download.opensuse.org/distribution/11.4/repo/oss/</baseurl> <alias>repo-oss</alias> - <name>openSUSE-11.3-Oss</name> + <name>openSUSE-11.4-Oss</name> <prod_dir>/</prod_dir> <enabled config:type="boolean">true</enabled> <autorefresh config:type="boolean">true</autorefresh> <priority config:type="integer">99</priority> </extra_url> <extra_url> - <baseurl>http://download.opensuse.org/distribution/11.3/repo/non-oss/</baseurl> + <baseurl>http://download.opensuse.org/distribution/11.4/repo/non-oss/</baseurl> <alias>repo-non-oss</alias> - <name>openSUSE-11.3-Non-Oss</name> + <name>openSUSE-11.4-Non-Oss</name> <prod_dir>/</prod_dir> <enabled config:type="boolean">true</enabled> <autorefresh config:type="boolean">true</autorefresh> <priority config:type="integer">99</priority> </extra_url> <extra_url> - <baseurl>http://download.opensuse.org/debug/distribution/11.3/repo/oss/</baseurl> + <baseurl>http://download.opensuse.org/debug/distribution/11.4/repo/oss/</baseurl> <alias>repo-debug</alias> - <name>openSUSE-11.3-Debug</name> + <name>openSUSE-11.4-Debug</name> <prod_dir>/</prod_dir> <enabled config:type="boolean">false</enabled> <autorefresh config:type="boolean">true</autorefresh> <priority config:type="integer">99</priority> </extra_url> <extra_url> - <baseurl>http://download.opensuse.org/source/distribution/11.3/repo/oss/</baseurl> + <baseurl>http://download.opensuse.org/source/distribution/11.4/repo/oss/</baseurl> <alias>repo-source</alias> - <name>openSUSE-11.3-Source</name> + <name>openSUSE-11.4-Source</name> <prod_dir>/</prod_dir> <enabled config:type="boolean">false</enabled> <autorefresh config:type="boolean">true</autorefresh> -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62461 - /tags/branch-Linux-11_3-2_19_19/country/
by jsuchome＠svn2.opensuse.org 31 Aug '10

31 Aug '10

Author: jsuchome Date: Tue Aug 31 11:54:20 2010 New Revision: 62461 URL: http://svn.opensuse.org/viewcvs/yast?rev=62461&view=rev Log: Created tag branch-Linux-11_3-2_19_19 for country Added: tags/branch-Linux-11_3-2_19_19/country/ - copied from r62460, branches/SuSE-Linux-11_3-Branch/country/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62460 - /tags/branch-Linux-11_3-2_19_19/
by jsuchome＠svn2.opensuse.org 31 Aug '10

31 Aug '10

Author: jsuchome Date: Tue Aug 31 11:54:18 2010 New Revision: 62460 URL: http://svn.opensuse.org/viewcvs/yast?rev=62460&view=rev Log: Created tag branch-Linux-11_3-2_19_19 Added: tags/branch-Linux-11_3-2_19_19/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62459 - in /branches/SuSE-Linux-11_3-Branch/country: VERSION package/yast2-country.changes timezone/src/Timezone.ycp timezone/src/dialogs.ycp
by jsuchome＠svn2.opensuse.org 31 Aug '10

31 Aug '10

Author: jsuchome Date: Tue Aug 31 11:54:14 2010 New Revision: 62459 URL: http://svn.opensuse.org/viewcvs/yast?rev=62459&view=rev Log: - mkinitrd call is needed after time change with localtime (bnc#627116) - remember if NTP was set; save NTP settings (bnc#627818) - 2.19.19 Modified: branches/SuSE-Linux-11_3-Branch/country/VERSION branches/SuSE-Linux-11_3-Branch/country/package/yast2-country.changes branches/SuSE-Linux-11_3-Branch/country/timezone/src/Timezone.ycp branches/SuSE-Linux-11_3-Branch/country/timezone/src/dialogs.ycp Modified: branches/SuSE-Linux-11_3-Branch/country/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/countr… ============================================================================== --- branches/SuSE-Linux-11_3-Branch/country/VERSION (original) +++ branches/SuSE-Linux-11_3-Branch/country/VERSION Tue Aug 31 11:54:14 2010 @@ -1 +1 @@ -2.19.18 +2.19.19 Modified: branches/SuSE-Linux-11_3-Branch/country/package/yast2-country.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/countr… ============================================================================== --- branches/SuSE-Linux-11_3-Branch/country/package/yast2-country.changes (original) +++ branches/SuSE-Linux-11_3-Branch/country/package/yast2-country.changes Tue Aug 31 11:54:14 2010 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Tue Aug 31 11:43:09 CEST 2010 - jsuchome(a)suse.cz + +- mkinitrd call is needed after time change with localtime + (bnc#627116) +- remember if NTP was set; save NTP settings (bnc#627818) +- 2.19.19 + +------------------------------------------------------------------- Tue Aug 3 15:26:11 CEST 2010 - jsuchome(a)suse.cz - in text mode, set the timezone when leaving dialog (bnc#617861) Modified: branches/SuSE-Linux-11_3-Branch/country/timezone/src/Timezone.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/countr… ============================================================================== --- branches/SuSE-Linux-11_3-Branch/country/timezone/src/Timezone.ycp (original) +++ branches/SuSE-Linux-11_3-Branch/country/timezone/src/Timezone.ycp Tue Aug 31 11:54:14 2010 @@ -370,6 +370,14 @@ return; } +global boolean CallMkinitrd () { + + y2milestone ("calling mkinitrd..."); + SCR::Execute (.target.bash, "/sbin/mkinitrd >> /var/log/YaST2/y2logmkinitrd 2>> /var/log/YaST2/y2logmkinitrd"); + y2milestone ("... done"); + return true; +} + /** * Set the new time and date given by user */ Modified: branches/SuSE-Linux-11_3-Branch/country/timezone/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/countr… ============================================================================== --- branches/SuSE-Linux-11_3-Branch/country/timezone/src/dialogs.ycp (original) +++ branches/SuSE-Linux-11_3-Branch/country/timezone/src/dialogs.ycp Tue Aug 31 11:54:14 2010 @@ -42,6 +42,9 @@ // if packages for NTP configuration are installed boolean ntp_installed = false; + // when checking for NTP status for first time, check the service status + boolean ntp_first_time = true; + /** * helper function for seting the time related stuff in module and possibly * adapting current time according to it @@ -264,7 +267,8 @@ ntp_rb = (boolean) ntp_call ("ui_init", $[ "replace_point": `id (`rp), "country" : Language::GetLanguageCountry(), - /*WTF*/"first_time" : true ]); + "first_time" : ntp_first_time ]); + ntp_first_time = false; UI::ChangeWidget(`id(`rb), `CurrentButton, (ntp_rb ? `ntp : `manual)); if (!dt_widgets) @@ -321,7 +325,7 @@ // before the sync, save the time zone (bnc#467318) Timezone::Set (Timezone::timezone, Stage::initial () && !Mode::live_installation ()); // true: go on, exit; false: loop on - boolean ntp_handled = (boolean) ntp_call ("ui_try_save", $[ "ntpdate_only" : true]); + boolean ntp_handled = (boolean) ntp_call ("ui_try_save", $[]); if (!ntp_handled) ret = `retry; // loop on else @@ -378,7 +382,21 @@ } else { + // in case of local time, we need to call mkinitrd (after setting timezone) + if (Timezone::hwclock == "--localtime" && !Stage::initial ()) + { + Timezone::Set (Timezone::timezone, true); + } + Timezone::SetTime( year, month, day, hour, minute, second ); + + if (Timezone::hwclock == "--localtime" && !Stage::initial ()) + { + // busy message + Popup::ShowFeedback ("", _("Updating initrd...")); + Timezone::CallMkinitrd (); + Popup::ClearFeedback (); + } } } } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62458 - /tags/branch-Linux-11_3-2_19_18/country/
by jsuchome＠svn2.opensuse.org 31 Aug '10

31 Aug '10

Author: jsuchome Date: Tue Aug 31 11:42:23 2010 New Revision: 62458 URL: http://svn.opensuse.org/viewcvs/yast?rev=62458&view=rev Log: Created tag branch-Linux-11_3-2_19_18 for country Added: tags/branch-Linux-11_3-2_19_18/country/ - copied from r62457, branches/SuSE-Linux-11_3-Branch/country/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62457 - /tags/branch-Linux-11_3-2_19_18/
by jsuchome＠svn2.opensuse.org 31 Aug '10

31 Aug '10

Author: jsuchome Date: Tue Aug 31 11:42:22 2010 New Revision: 62457 URL: http://svn.opensuse.org/viewcvs/yast?rev=62457&view=rev Log: Created tag branch-Linux-11_3-2_19_18 Added: tags/branch-Linux-11_3-2_19_18/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62456 - in /branches/SuSE-Linux-11_3-Branch/country: VERSION package/yast2-country.changes timezone/src/dialogs.ycp
by jsuchome＠svn2.opensuse.org 31 Aug '10

31 Aug '10

Author: jsuchome Date: Tue Aug 31 11:42:17 2010 New Revision: 62456 URL: http://svn.opensuse.org/viewcvs/yast?rev=62456&view=rev Log: - in text mode, set the timezone when leaving dialog (bnc#617861) - 2.19.18 Modified: branches/SuSE-Linux-11_3-Branch/country/VERSION branches/SuSE-Linux-11_3-Branch/country/package/yast2-country.changes branches/SuSE-Linux-11_3-Branch/country/timezone/src/dialogs.ycp Modified: branches/SuSE-Linux-11_3-Branch/country/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/countr… ============================================================================== --- branches/SuSE-Linux-11_3-Branch/country/VERSION (original) +++ branches/SuSE-Linux-11_3-Branch/country/VERSION Tue Aug 31 11:42:17 2010 @@ -1 +1 @@ -2.19.17 +2.19.18 Modified: branches/SuSE-Linux-11_3-Branch/country/package/yast2-country.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/countr… ============================================================================== --- branches/SuSE-Linux-11_3-Branch/country/package/yast2-country.changes (original) +++ branches/SuSE-Linux-11_3-Branch/country/package/yast2-country.changes Tue Aug 31 11:42:17 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Aug 3 15:26:11 CEST 2010 - jsuchome(a)suse.cz + +- in text mode, set the timezone when leaving dialog (bnc#617861) +- 2.19.18 + +------------------------------------------------------------------- Fri Jun 25 10:47:20 CEST 2010 - jsuchome(a)suse.cz - Console.ycp: correct parsing of the kernel line (bnc#604699) Modified: branches/SuSE-Linux-11_3-Branch/country/timezone/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/countr… ============================================================================== --- branches/SuSE-Linux-11_3-Branch/country/timezone/src/dialogs.ycp (original) +++ branches/SuSE-Linux-11_3-Branch/country/timezone/src/dialogs.ycp Tue Aug 31 11:42:17 2010 @@ -766,6 +766,19 @@ } else if (ret == `settime) { + // timezone was not adapted in ncurses (bnc#617861) + if (textmode) + { + string tz = selected_timezone (); + if (tz != timezone) + { + timezone = tz; + if (timezone != timezone_old) + changed_time = true; + timezone_old = timezone; + SetTimezone (hwclock_s, timezone, false, changed_time); + } + } if (SetTimeDialog()) { Timezone::diff = 0; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62455 - /tags/branch-Linux-11_3-2_21_72/gtk/
by rpmcruz＠svn2.opensuse.org 30 Aug '10

30 Aug '10

Author: rpmcruz Date: Mon Aug 30 19:07:14 2010 New Revision: 62455 URL: http://svn.opensuse.org/viewcvs/yast?rev=62455&view=rev Log: Created tag branch-Linux-11_3-2_21_72 for gtk Added: tags/branch-Linux-11_3-2_21_72/gtk/ - copied from r62454, branches/SuSE-Linux-11_3-Branch/gtk/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62454 - /tags/branch-Linux-11_3-2_21_72/
by rpmcruz＠svn2.opensuse.org 30 Aug '10

30 Aug '10

Author: rpmcruz Date: Mon Aug 30 19:07:07 2010 New Revision: 62454 URL: http://svn.opensuse.org/viewcvs/yast?rev=62454&view=rev Log: Created tag branch-Linux-11_3-2_21_72 Added: tags/branch-Linux-11_3-2_21_72/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62453 - in /branches/SuSE-Linux-11_3-Branch/gtk: VERSION VERSION.cmake modules/FindGTK2.cmake package/yast2-gtk.changes yast2-gtk.spec.in
by rpmcruz＠svn2.opensuse.org 30 Aug '10

30 Aug '10

Author: rpmcruz Date: Mon Aug 30 19:07:05 2010 New Revision: 62453 URL: http://svn.opensuse.org/viewcvs/yast?rev=62453&view=rev Log: Milestone version. Modified: branches/SuSE-Linux-11_3-Branch/gtk/VERSION branches/SuSE-Linux-11_3-Branch/gtk/VERSION.cmake branches/SuSE-Linux-11_3-Branch/gtk/modules/FindGTK2.cmake branches/SuSE-Linux-11_3-Branch/gtk/package/yast2-gtk.changes branches/SuSE-Linux-11_3-Branch/gtk/yast2-gtk.spec.in Modified: branches/SuSE-Linux-11_3-Branch/gtk/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/gtk/VE… ============================================================================== --- branches/SuSE-Linux-11_3-Branch/gtk/VERSION (original) +++ branches/SuSE-Linux-11_3-Branch/gtk/VERSION Mon Aug 30 19:07:05 2010 @@ -1 +1 @@ -2.21.71 +2.21.72 Modified: branches/SuSE-Linux-11_3-Branch/gtk/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/gtk/VE… ============================================================================== --- branches/SuSE-Linux-11_3-Branch/gtk/VERSION.cmake (original) +++ branches/SuSE-Linux-11_3-Branch/gtk/VERSION.cmake Mon Aug 30 19:07:05 2010 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "21") -SET(VERSION_PATCH "71") +SET(VERSION_PATCH "72") Modified: branches/SuSE-Linux-11_3-Branch/gtk/modules/FindGTK2.cmake URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/gtk/mo… ============================================================================== --- branches/SuSE-Linux-11_3-Branch/gtk/modules/FindGTK2.cmake (original) +++ branches/SuSE-Linux-11_3-Branch/gtk/modules/FindGTK2.cmake Mon Aug 30 19:07:05 2010 @@ -138,7 +138,6 @@ atkmm-1.6 cairo cairomm-1.0 - gdk-pixbuf-2.0 gdkmm-2.4 giomm-2.4 gtk-2.0 @@ -400,9 +399,6 @@ _GTK2_FIND_INCLUDE_DIR(GTK2_GOBJECT_INCLUDE_DIR gobject/gobject.h) _GTK2_FIND_LIBRARY (GTK2_GOBJECT_LIBRARY gobject false true) - _GTK2_FIND_INCLUDE_DIR(GTK2_GDK_PIXBUF_INCLUDE_DIR gdk-pixbuf/gdk-pixbuf.h) - _GTK2_FIND_LIBRARY (GTK2_GDK_PIXBUF_LIBRARY gdk_pixbuf false true) - _GTK2_FIND_INCLUDE_DIR(GTK2_GDK_INCLUDE_DIR gdk/gdk.h) _GTK2_FIND_INCLUDE_DIR(GTK2_GDKCONFIG_INCLUDE_DIR gdkconfig.h) _GTK2_FIND_LIBRARY (GTK2_GDK_LIBRARY gdk-x11 false true) Modified: branches/SuSE-Linux-11_3-Branch/gtk/package/yast2-gtk.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/gtk/pa… ============================================================================== --- branches/SuSE-Linux-11_3-Branch/gtk/package/yast2-gtk.changes (original) +++ branches/SuSE-Linux-11_3-Branch/gtk/package/yast2-gtk.changes Mon Aug 30 19:07:05 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Aug 30 18:05:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt + +- 2.21.72 +- temporarily reverting cmake fixes: we need a 11.3 version +built in order to issue a patch. + +------------------------------------------------------------------- Mon Aug 30 17:45:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt - 2.21.71 Modified: branches/SuSE-Linux-11_3-Branch/gtk/yast2-gtk.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/gtk/ya… ============================================================================== --- branches/SuSE-Linux-11_3-Branch/gtk/yast2-gtk.spec.in (original) +++ branches/SuSE-Linux-11_3-Branch/gtk/yast2-gtk.spec.in Mon Aug 30 19:07:05 2010 @@ -9,11 +9,9 @@ BuildRequires: cmake BuildRequires: gcc-c++ blocxx-devel libxcrypt-devel BuildRequires: gtk2-devel -BuildRequires: gdk-pixbuf-devel BuildRequires: yast2-devtools >= 2.16.3 BuildRequires: yast2-libyui-devel >= 2.18.8 BuildRequires: libzypp-devel >= 6.3.0 -Requires: gtk2 Requires: yast2-libyui >= 2.18.8 Requires: yast2_theme >= 2.16.1 Requires: libzypp >= 6.3.0 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62452 - /tags/branch-Linux-11_3-2_21_71/gtk/
by rpmcruz＠svn2.opensuse.org 30 Aug '10

30 Aug '10

Author: rpmcruz Date: Mon Aug 30 18:49:09 2010 New Revision: 62452 URL: http://svn.opensuse.org/viewcvs/yast?rev=62452&view=rev Log: Created tag branch-Linux-11_3-2_21_71 for gtk Added: tags/branch-Linux-11_3-2_21_71/gtk/ - copied from r62451, branches/SuSE-Linux-11_3-Branch/gtk/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62451 - /tags/branch-Linux-11_3-2_21_71/
by rpmcruz＠svn2.opensuse.org 30 Aug '10

30 Aug '10

Author: rpmcruz Date: Mon Aug 30 18:49:02 2010 New Revision: 62451 URL: http://svn.opensuse.org/viewcvs/yast?rev=62451&view=rev Log: Created tag branch-Linux-11_3-2_21_71 Added: tags/branch-Linux-11_3-2_21_71/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62450 - in /branches/SuSE-Linux-11_3-Branch/gtk: VERSION VERSION.cmake modules/FindGTK2.cmake package/yast2-gtk.changes yast2-gtk.spec.in
by rpmcruz＠svn2.opensuse.org 30 Aug '10

30 Aug '10

Author: rpmcruz Date: Mon Aug 30 18:48:58 2010 New Revision: 62450 URL: http://svn.opensuse.org/viewcvs/yast?rev=62450&view=rev Log: Milestone version. Modified: branches/SuSE-Linux-11_3-Branch/gtk/VERSION branches/SuSE-Linux-11_3-Branch/gtk/VERSION.cmake branches/SuSE-Linux-11_3-Branch/gtk/modules/FindGTK2.cmake branches/SuSE-Linux-11_3-Branch/gtk/package/yast2-gtk.changes branches/SuSE-Linux-11_3-Branch/gtk/yast2-gtk.spec.in Modified: branches/SuSE-Linux-11_3-Branch/gtk/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/gtk/VE… ============================================================================== --- branches/SuSE-Linux-11_3-Branch/gtk/VERSION (original) +++ branches/SuSE-Linux-11_3-Branch/gtk/VERSION Mon Aug 30 18:48:58 2010 @@ -1 +1 @@ -2.21.70 +2.21.71 Modified: branches/SuSE-Linux-11_3-Branch/gtk/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/gtk/VE… ============================================================================== --- branches/SuSE-Linux-11_3-Branch/gtk/VERSION.cmake (original) +++ branches/SuSE-Linux-11_3-Branch/gtk/VERSION.cmake Mon Aug 30 18:48:58 2010 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "21") -SET(VERSION_PATCH "70") +SET(VERSION_PATCH "71") Modified: branches/SuSE-Linux-11_3-Branch/gtk/modules/FindGTK2.cmake URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/gtk/mo… ============================================================================== --- branches/SuSE-Linux-11_3-Branch/gtk/modules/FindGTK2.cmake (original) +++ branches/SuSE-Linux-11_3-Branch/gtk/modules/FindGTK2.cmake Mon Aug 30 18:48:58 2010 @@ -138,6 +138,7 @@ atkmm-1.6 cairo cairomm-1.0 + gdk-pixbuf-2.0 gdkmm-2.4 giomm-2.4 gtk-2.0 @@ -399,6 +400,9 @@ _GTK2_FIND_INCLUDE_DIR(GTK2_GOBJECT_INCLUDE_DIR gobject/gobject.h) _GTK2_FIND_LIBRARY (GTK2_GOBJECT_LIBRARY gobject false true) + _GTK2_FIND_INCLUDE_DIR(GTK2_GDK_PIXBUF_INCLUDE_DIR gdk-pixbuf/gdk-pixbuf.h) + _GTK2_FIND_LIBRARY (GTK2_GDK_PIXBUF_LIBRARY gdk_pixbuf false true) + _GTK2_FIND_INCLUDE_DIR(GTK2_GDK_INCLUDE_DIR gdk/gdk.h) _GTK2_FIND_INCLUDE_DIR(GTK2_GDKCONFIG_INCLUDE_DIR gdkconfig.h) _GTK2_FIND_LIBRARY (GTK2_GDK_LIBRARY gdk-x11 false true) Modified: branches/SuSE-Linux-11_3-Branch/gtk/package/yast2-gtk.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/gtk/pa… ============================================================================== --- branches/SuSE-Linux-11_3-Branch/gtk/package/yast2-gtk.changes (original) +++ branches/SuSE-Linux-11_3-Branch/gtk/package/yast2-gtk.changes Mon Aug 30 18:48:58 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Aug 30 17:45:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt + +- 2.21.71 +- fix compilation error on Factory (bnc#635352) +- uploading the 11.3 branch for patching purposes (bnc#624310). + +------------------------------------------------------------------- Mon Aug 23 00:40:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt - 2.21.70 Modified: branches/SuSE-Linux-11_3-Branch/gtk/yast2-gtk.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/gtk/ya… ============================================================================== --- branches/SuSE-Linux-11_3-Branch/gtk/yast2-gtk.spec.in (original) +++ branches/SuSE-Linux-11_3-Branch/gtk/yast2-gtk.spec.in Mon Aug 30 18:48:58 2010 @@ -9,9 +9,11 @@ BuildRequires: cmake BuildRequires: gcc-c++ blocxx-devel libxcrypt-devel BuildRequires: gtk2-devel +BuildRequires: gdk-pixbuf-devel BuildRequires: yast2-devtools >= 2.16.3 BuildRequires: yast2-libyui-devel >= 2.18.8 BuildRequires: libzypp-devel >= 6.3.0 +Requires: gtk2 Requires: yast2-libyui >= 2.18.8 Requires: yast2_theme >= 2.16.1 Requires: libzypp >= 6.3.0 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62449 - in /trunk/autoinstallation: package/autoyast2.changes src/dialogs/ask.ycp
by ug＠svn2.opensuse.org 30 Aug '10

30 Aug '10

Author: ug Date: Mon Aug 30 15:10:22 2010 New Revision: 62449 URL: http://svn.opensuse.org/viewcvs/yast?rev=62449&view=rev Log: boolean-value for path in ask-dialog fixed Modified: trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/dialogs/ask.ycp Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyas… ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Mon Aug 30 15:10:22 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Aug 30 15:09:51 CEST 2010 - ug(a)suse.de + +- setting a boolean via <path> does not work (regression from the + fix bnc#572166) + +------------------------------------------------------------------- Mon Aug 30 13:06:11 CEST 2010 - ug(a)suse.de - potential endless reboot during online update fixed Modified: trunk/autoinstallation/src/dialogs/ask.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/dialogs/ask… ============================================================================== --- trunk/autoinstallation/src/dialogs/ask.ycp (original) +++ trunk/autoinstallation/src/dialogs/ask.ycp Mon Aug 30 15:10:22 2010 @@ -227,8 +227,6 @@ any val = UI::QueryWidget(`id(entry_id), `Value); if( ask["type"]:"string" == "integer" ) { val = tointeger((string)val); - } else if( ask["type"]:"string" == "boolean" ) { - val = ( (boolean)val ? "true" : "false" ); } if( ask["password"]:false == true ) { string pass2 = (string)UI::QueryWidget(`id(`pass2), `Value); @@ -249,8 +247,13 @@ }); if( file != "" ) { - if( ! SCR::Write (.target.string, file, sformat("%1",val)) ) - y2milestone("writing answer to %1 failed",file); + if( ask["type"]:"string" == "boolean" ) { + if( ! SCR::Write (.target.string, file, sformat("%1", ( (boolean)val ? "true" : "false" )))) + y2milestone("writing answer to %1 failed",file); + } else { + if( ! SCR::Write (.target.string, file, sformat("%1",val)) ) + y2milestone("writing answer to %1 failed",file); + } } if( script != $[] ) { string scriptName = script["filename"]:"ask_script.sh"; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62448 - /branches/SuSE-Code-11-SP1-Branch/autoinstallation/package/autoyast2.changes
by ug＠svn2.opensuse.org 30 Aug '10

30 Aug '10

Author: ug Date: Mon Aug 30 15:08:45 2010 New Revision: 62448 URL: http://svn.opensuse.org/viewcvs/yast?rev=62448&view=rev Log: revert patch - from branch Modified: branches/SuSE-Code-11-SP1-Branch/autoinstallation/package/autoyast2.changes Modified: branches/SuSE-Code-11-SP1-Branch/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/autoi… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/autoinstallation/package/autoyast2.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/autoinstallation/package/autoyast2.changes Mon Aug 30 15:08:45 2010 @@ -1,10 +1,4 @@ ------------------------------------------------------------------- -Mon Aug 30 14:56:36 CEST 2010 - ug(a)suse.de - -- setting a boolean via <path> does not work (regression from the - fix bnc#572166) - -------------------------------------------------------------------- Fri Apr 9 11:30:37 CEST 2010 - ug(a)suse.de - reuse of a physical device for an LVM fixed (bnc#591601) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62447 - /branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/dialogs/ask.ycp
by ug＠svn2.opensuse.org 30 Aug '10

30 Aug '10

Author: ug Date: Mon Aug 30 15:02:30 2010 New Revision: 62447 URL: http://svn.opensuse.org/viewcvs/yast?rev=62447&view=rev Log: rever patch - from branch Modified: branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/dialogs/ask.ycp Modified: branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/dialogs/ask.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/autoi… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/dialogs/ask.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/dialogs/ask.ycp Mon Aug 30 15:02:30 2010 @@ -185,6 +185,8 @@ any val = UI::QueryWidget(`id(entry_id), `Value); if( ask["type"]:"string" == "integer" ) { val = tointeger((string)val); + } else if( ask["type"]:"string" == "boolean" ) { + val = ( (boolean)val ? "true" : "false" ); } if( ask["password"]:false == true ) { string pass2 = (string)UI::QueryWidget(`id(`pass2), `Value); @@ -205,13 +207,8 @@ }); if( file != "" ) { - if( ask["type"]:"string" == "boolean" ) { - if( ! SCR::Write (.target.string, file, sformat("%1", ( (boolean)val ? "true" : "false" )))) - y2milestone("writing answer to %1 failed",file); - } else { - if( ! SCR::Write (.target.string, file, sformat("%1",val)) ) - y2milestone("writing answer to %1 failed",file); - } + if( ! SCR::Write (.target.string, file, sformat("%1",val)) ) + y2milestone("writing answer to %1 failed",file); } if( script != $[] ) { string scriptName = script["filename"]:"ask_script.sh"; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62446 - /branches/SuSE-Code-11-SP1-Branch/autoinstallation/package/autoyast2.changes
by ug＠svn2.opensuse.org 30 Aug '10

30 Aug '10

Author: ug Date: Mon Aug 30 14:57:36 2010 New Revision: 62446 URL: http://svn.opensuse.org/viewcvs/yast?rev=62446&view=rev Log: changes Modified: branches/SuSE-Code-11-SP1-Branch/autoinstallation/package/autoyast2.changes Modified: branches/SuSE-Code-11-SP1-Branch/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/autoi… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/autoinstallation/package/autoyast2.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/autoinstallation/package/autoyast2.changes Mon Aug 30 14:57:36 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Aug 30 14:56:36 CEST 2010 - ug(a)suse.de + +- setting a boolean via <path> does not work (regression from the + fix bnc#572166) + +------------------------------------------------------------------- Fri Apr 9 11:30:37 CEST 2010 - ug(a)suse.de - reuse of a physical device for an LVM fixed (bnc#591601) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62445 - /branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/dialogs/ask.ycp
by ug＠svn2.opensuse.org 30 Aug '10

30 Aug '10

Author: ug Date: Mon Aug 30 14:56:29 2010 New Revision: 62445 URL: http://svn.opensuse.org/viewcvs/yast?rev=62445&view=rev Log: boolean ask-dialog fixed Modified: branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/dialogs/ask.ycp Modified: branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/dialogs/ask.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/autoi… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/dialogs/ask.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/autoinstallation/src/dialogs/ask.ycp Mon Aug 30 14:56:29 2010 @@ -185,8 +185,6 @@ any val = UI::QueryWidget(`id(entry_id), `Value); if( ask["type"]:"string" == "integer" ) { val = tointeger((string)val); - } else if( ask["type"]:"string" == "boolean" ) { - val = ( (boolean)val ? "true" : "false" ); } if( ask["password"]:false == true ) { string pass2 = (string)UI::QueryWidget(`id(`pass2), `Value); @@ -207,8 +205,13 @@ }); if( file != "" ) { - if( ! SCR::Write (.target.string, file, sformat("%1",val)) ) - y2milestone("writing answer to %1 failed",file); + if( ask["type"]:"string" == "boolean" ) { + if( ! SCR::Write (.target.string, file, sformat("%1", ( (boolean)val ? "true" : "false" )))) + y2milestone("writing answer to %1 failed",file); + } else { + if( ! SCR::Write (.target.string, file, sformat("%1",val)) ) + y2milestone("writing answer to %1 failed",file); + } } if( script != $[] ) { string scriptName = script["filename"]:"ask_script.sh"; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62444 - in /trunk/autoinstallation: package/autoyast2.changes src/clients/inst_autoconfigure.ycp
by ug＠svn2.opensuse.org 30 Aug '10

30 Aug '10

Author: ug Date: Mon Aug 30 13:06:41 2010 New Revision: 62444 URL: http://svn.opensuse.org/viewcvs/yast?rev=62444&view=rev Log: potential endless reboot during online update fixed Modified: trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/clients/inst_autoconfigure.ycp Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyas… ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Mon Aug 30 13:06:41 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Aug 30 13:06:11 CEST 2010 - ug(a)suse.de + +- potential endless reboot during online update fixed + +------------------------------------------------------------------- Tue Aug 10 15:12:56 CEST 2010 - ug(a)suse.de - media_url removed from CDATA Modified: trunk/autoinstallation/src/clients/inst_autoconfigure.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/clients/ins… ============================================================================== --- trunk/autoinstallation/src/clients/inst_autoconfigure.ycp (original) +++ trunk/autoinstallation/src/clients/inst_autoconfigure.ycp Mon Aug 30 13:06:41 2010 @@ -231,7 +231,7 @@ symbol online_update_ret = (symbol)Call::Function("do_online_update_auto", ["Write"]); processWait( "do_online_update", "post-modules" ); if( online_update_ret == `reboot ) { - map script = $[ "filename":"zzz_reboot", "source":"shutdown -r now" ]; + map script = $[ "filename":"zzz_reboot", "source":"chkconfig autoyast off\nshutdown -r now" ]; AutoinstScripts::init = add( AutoinstScripts::init, script ); } } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62443 - /trunk/gtk/modules/FindGTK2.cmake
by coolo＠svn2.opensuse.org 30 Aug '10

30 Aug '10

Author: coolo Date: Mon Aug 30 11:24:04 2010 New Revision: 62443 URL: http://svn.opensuse.org/viewcvs/yast?rev=62443&view=rev Log: patch by vuntz to fix gtk detection Modified: trunk/gtk/modules/FindGTK2.cmake Modified: trunk/gtk/modules/FindGTK2.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/modules/FindGTK2.cmake?rev=6… ============================================================================== --- trunk/gtk/modules/FindGTK2.cmake (original) +++ trunk/gtk/modules/FindGTK2.cmake Mon Aug 30 11:24:04 2010 @@ -138,6 +138,7 @@ atkmm-1.6 cairo cairomm-1.0 + gdk-pixbuf-2.0 gdkmm-2.4 giomm-2.4 gtk-2.0 @@ -399,6 +400,9 @@ _GTK2_FIND_INCLUDE_DIR(GTK2_GOBJECT_INCLUDE_DIR gobject/gobject.h) _GTK2_FIND_LIBRARY (GTK2_GOBJECT_LIBRARY gobject false true) + _GTK2_FIND_INCLUDE_DIR(GTK2_GDK_PIXBUF_INCLUDE_DIR gdk-pixbuf/gdk-pixbuf.h) + _GTK2_FIND_LIBRARY (GTK2_GDK_PIXBUF_LIBRARY gdk_pixbuf false true) + _GTK2_FIND_INCLUDE_DIR(GTK2_GDK_INCLUDE_DIR gdk/gdk.h) _GTK2_FIND_INCLUDE_DIR(GTK2_GDKCONFIG_INCLUDE_DIR gdkconfig.h) _GTK2_FIND_LIBRARY (GTK2_GDK_LIBRARY gdk-x11 false true) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62442 - in /trunk/gtk: ChangeLog yast2-gtk.spec.in
by rpmcruz＠svn2.opensuse.org 29 Aug '10

29 Aug '10

Author: rpmcruz Date: Sun Aug 29 15:07:29 2010 New Revision: 62442 URL: http://svn.opensuse.org/viewcvs/yast?rev=62442&view=rev Log: * yast2-gtk.spec.in: add gdk-pixbuf-devel to BuildRequires. gtk and gdk-pixbuf divorced. bug fix 635352. Modified: trunk/gtk/ChangeLog trunk/gtk/yast2-gtk.spec.in Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=62442&r1=62441… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Sun Aug 29 15:07:29 2010 @@ -1,3 +1,9 @@ +2010-08-29 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * yast2-gtk.spec.in: add gdk-pixbuf-devel to + BuildRequires. gtk and gdk-pixbuf divorced. + bug fix 635352. + 2010-07-26 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/pkg/ygtkpkgmenubar.cc: bug fix 624310: file > Modified: trunk/gtk/yast2-gtk.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/yast2-gtk.spec.in?rev=62442&… ============================================================================== --- trunk/gtk/yast2-gtk.spec.in (original) +++ trunk/gtk/yast2-gtk.spec.in Sun Aug 29 15:07:29 2010 @@ -9,9 +9,11 @@ BuildRequires: cmake BuildRequires: gcc-c++ blocxx-devel libxcrypt-devel BuildRequires: gtk2-devel +BuildRequires: gdk-pixbuf-devel BuildRequires: yast2-devtools >= 2.16.3 BuildRequires: yast2-libyui-devel >= 2.18.8 BuildRequires: libzypp-devel >= 6.3.0 +Requires: gtk2 Requires: yast2-libyui >= 2.18.8 Requires: yast2_theme >= 2.16.1 Requires: libzypp >= 6.3.0 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62441 - /tags/stable-2_19_7/registration/
by jdsn＠svn2.opensuse.org 27 Aug '10

27 Aug '10

Author: jdsn Date: Sat Aug 28 01:24:30 2010 New Revision: 62441 URL: http://svn.opensuse.org/viewcvs/yast?rev=62441&view=rev Log: Created tag stable-2_19_7 for registration Added: tags/stable-2_19_7/registration/ - copied from r62440, trunk/registration/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62440 - /tags/branch-Code-11-SP1-2_17_35/registration/
by jdsn＠svn2.opensuse.org 27 Aug '10

27 Aug '10

Author: jdsn Date: Sat Aug 28 01:24:24 2010 New Revision: 62440 URL: http://svn.opensuse.org/viewcvs/yast?rev=62440&view=rev Log: Created tag branch-Code-11-SP1-2_17_35 for registration Added: tags/branch-Code-11-SP1-2_17_35/registration/ (props changed) - copied from r62439, branches/SuSE-Code-11-SP1-Branch/registration/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62439 - /branches/SuSE-Code-11-SP1-Branch/registration/package/yast2-registration.changes
by jdsn＠svn2.opensuse.org 27 Aug '10

27 Aug '10

Author: jdsn Date: Sat Aug 28 01:07:23 2010 New Revision: 62439 URL: http://svn.opensuse.org/viewcvs/yast?rev=62439&view=rev Log: fix changes file, mention relevant bug number Modified: branches/SuSE-Code-11-SP1-Branch/registration/package/yast2-registration.changes Modified: branches/SuSE-Code-11-SP1-Branch/registration/package/yast2-registration.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/regis… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/registration/package/yast2-registration.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/registration/package/yast2-registration.changes Sat Aug 28 01:07:23 2010 @@ -1,7 +1,8 @@ ------------------------------------------------------------------- Fri Aug 27 20:33:46 CEST 2010 - jdsn(a)suse.de -- fix registration status detection, common flag file (bnc#634026) +- fix registration status detection (bnc#634026) + use a common flag file (bnc#633183) - fix proxy settings for WebYaST registrations (bnc#626965) - 2.17.35 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62438 - /trunk/registration/package/yast2-registration.changes
by jdsn＠svn2.opensuse.org 27 Aug '10

27 Aug '10

Author: jdsn Date: Sat Aug 28 01:04:43 2010 New Revision: 62438 URL: http://svn.opensuse.org/viewcvs/yast?rev=62438&view=rev Log: fix changes file, mention relevant bug number Modified: trunk/registration/package/yast2-registration.changes Modified: trunk/registration/package/yast2-registration.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/package/yast2-regis… ============================================================================== --- trunk/registration/package/yast2-registration.changes (original) +++ trunk/registration/package/yast2-registration.changes Sat Aug 28 01:04:43 2010 @@ -1,7 +1,8 @@ ------------------------------------------------------------------- Sat Aug 28 00:43:11 CEST 2010 - jdsn(a)suse.de -- fix registration status detection, common flag file (bnc#634026) +- fix registration status detection (bnc#634026) + use a common flag file (bnc#633183) - fix proxy settings for WebYaST registrations (bnc#626965) - 2.19.7 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62437 - in /trunk/registration: VERSION package/yast2-registration.changes src/modules/Register.ycp src/modules/YSR.pm
by jdsn＠svn2.opensuse.org 27 Aug '10

27 Aug '10

Author: jdsn Date: Sat Aug 28 00:50:50 2010 New Revision: 62437 URL: http://svn.opensuse.org/viewcvs/yast?rev=62437&view=rev Log: fix registration status detection, common flag file (bnc#634026) fix proxy settings for WebYaST registrations (bnc#626965) 2.19.7 Modified: trunk/registration/VERSION trunk/registration/package/yast2-registration.changes trunk/registration/src/modules/Register.ycp trunk/registration/src/modules/YSR.pm Modified: trunk/registration/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/VERSION?rev=62437&r… ============================================================================== --- trunk/registration/VERSION (original) +++ trunk/registration/VERSION Sat Aug 28 00:50:50 2010 @@ -1 +1 @@ -2.19.6 +2.19.7 Modified: trunk/registration/package/yast2-registration.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/package/yast2-regis… ============================================================================== --- trunk/registration/package/yast2-registration.changes (original) +++ trunk/registration/package/yast2-registration.changes Sat Aug 28 00:50:50 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Sat Aug 28 00:43:11 CEST 2010 - jdsn(a)suse.de + +- fix registration status detection, common flag file (bnc#634026) +- fix proxy settings for WebYaST registrations (bnc#626965) +- 2.19.7 + +------------------------------------------------------------------- Fri Aug 20 15:45:49 CEST 2010 - jdsn(a)suse.de - use correct error code for backend init errors (bnc#633183) Modified: trunk/registration/src/modules/Register.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/src/modules/Registe… ============================================================================== --- trunk/registration/src/modules/Register.ycp (original) +++ trunk/registration/src/modules/Register.ycp Sat Aug 28 00:50:50 2010 @@ -1521,8 +1521,9 @@ if ( initialSRstatus == 0 ) { y2milestone("SuseRegister returned with status: %1", initialSRstatus); - // touch webyast flag file to show in webyast that this machine is already registered - SCR::Execute(.target.bash, sformat(" [ -d /var/lib/yastws ] && touch /var/lib/yastws/enable_SLM_webyast_registration_workaround ")); + // touch webyast flag file to show in webyast that this machine is already registered (bnc#634026) + SCR::Execute(.target.bash, " [ -d /var/lib/yastws ] && date +%s > /var/lib/yastws/registration_successful " ); + SCR::Execute(.target.bash, " [ -d /var/lib/suseRegister ] && date +%s > /var/lib/suseRegister/y2_registration_successful " ); } Modified: trunk/registration/src/modules/YSR.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/src/modules/YSR.pm?… ============================================================================== --- trunk/registration/src/modules/YSR.pm (original) +++ trunk/registration/src/modules/YSR.pm Sat Aug 28 00:50:50 2010 @@ -20,6 +20,12 @@ my $global_ctx = {}; +# flag files for registration status +my $FFwebyast_dir = '/var/lib/yastws'; +my $FFwebyast = $FFwebyast_dir.'/registration_successful'; +my $FFgeneric_dir = '/var/lib/suseRegister'; +my $FFgeneric = $FFgeneric_dir.'/y2_registration_successful'; + # set the PATH in the perl environment (bnc#621914) # otherwise it is empty in system calls $ENV{PATH}="/usr/bin:/sbin:/usr/sbin:/bin"; @@ -185,6 +191,13 @@ } } +BEGIN { $TYPEINFO{unset_proxy} = ["function", "void"]; } +sub unset_proxy +{ + my $self = shift; + delete $ENV{http_proxy}; + delete $ENV{https_proxy}; +} BEGIN { $TYPEINFO{statelessregister} = ["function", [ "map", "string", "any"], ["map", "string", "any"], ["map", "string", "any"]]; } sub statelessregister @@ -192,7 +205,6 @@ my $self = shift; my $ctx = shift; my $arguments = shift; - my $SRregisterFlagFile = '/var/lib/yastws/registration_successful'; unless ( defined $ctx && ref($ctx) eq "HASH" ) { @@ -200,34 +212,30 @@ 'contexterror' => '1' }; } - # check if the system is still initialized - otherwise run init_ctx again - unless ( defined $global_ctx && ref($global_ctx) eq "HASH" && exists $global_ctx->{debug} ) - { - # not initialized - need to reinitialize - - # 1. proxy - fixed proxy settings (bnc#626965) - if ( exists $ctx->{'proxy-http_proxy'} || exists $ctx->{'proxy-https_proxy'} ) - { - my $http_proxy = $ctx->{'proxy-http_proxy'} || undef; - my $https_proxy = $ctx->{'proxy-https_proxy'} || undef; - $self->set_proxy($http_proxy, $https_proxy); - delete $ctx->{'proxy-http_proxy'}; - delete $ctx->{'proxy-https_proxy'}; - } - - # 2. registration context - $self->init_ctx($ctx); - my $init_err = $self->get_errorcode(); - - unless ($init_err == 0) - { - # init failed - return { 'error' => 'The initialization of the registration failed.' - ,'initerror' => $init_err - ,'errorcode' => 199 - }; + # always do a fresh init of proxy and context - otherwise old cached wrong data may be used + # 1. proxy - fixed proxy settings (bnc#626965) + $self->unset_proxy(); + if ( exists $ctx->{'proxy-http_proxy'} || exists $ctx->{'proxy-https_proxy'} ) + { + my $http_proxy = $ctx->{'proxy-http_proxy'} || undef; + my $https_proxy = $ctx->{'proxy-https_proxy'} || undef; + $self->set_proxy($http_proxy, $https_proxy); + delete $ctx->{'proxy-http_proxy'}; + delete $ctx->{'proxy-https_proxy'}; + } + + # 2. registration context + $self->init_ctx($ctx); + my $init_err = $self->get_errorcode(); + + unless ($init_err == 0) + { + # init failed + return { 'error' => 'The initialization of the registration failed.' + ,'initerror' => $init_err + ,'errorcode' => 199 + }; } - } # set arguments # must be set one for one, otherwise other data would be overwritten @@ -264,6 +272,9 @@ ,'manualurl' => $manualurl }; + # we had a new registration process - so we reset the flag files + $self->removeregisteredflag(); + if ( $exitcode == 0 ) { # successful registration, so we need to save the last ZMD config @@ -296,9 +307,7 @@ ${$regret}{'tasklist'} = XMLout( {'item' => $tasklist}, rootname => 'tasklist', KeyAttr => { item => "+ALIAS", catalog => "+ALIAS" }, NoAttr => 1); # write flagfile for successful registration - open(FLAGFILE, "> $SRregisterFlagFile"); - print FLAGFILE localtime(); - close FLAGFILE; + $self->setregisteredflag(1); # to be on the safe side for a following registration request, we need to delete the context data $self->del_ctx(); @@ -350,7 +359,6 @@ my $SRconf = '/etc/suseRegister.conf'; my $SRcert = '/etc/ssl/certs/registration-server.pem'; my $SRcredentials = '/etc/zypp/credentials.d/NCCcredentials'; - my $SRregisterFlagFile = '/var/lib/yastws/registration_successful'; my $url = undef; my $cert = undef; @@ -386,7 +394,7 @@ } # read the guid - if ( -e $SRcredentials && -e $SRregisterFlagFile ) + if ( -e $SRcredentials && $self->getregisteredflag() ) { if (open(CRED, "< $SRcredentials") ) { @@ -406,7 +414,7 @@ $guid = '' unless defined $guid; # delete a flagfile that might be still there if no guid is found - unlink($SRregisterFlagFile) if $guid eq ''; + $self->removeregisteredflag() if $guid eq ''; return { "regserverurl" => $url, "regserverca" => $cert, @@ -495,6 +503,87 @@ return $success; } + +# +# setregisteredflag +# +# Write flagfile to identify a successful registration +# Note: this is only a good guess, only the registration server knows about the status +# (bnc#634026) +# +sub setregisteredflag() +{ + my $self = shift; + my $status = shift; + my $written = 0; + + my $status_str = time(); + $status_str = '' unless defined $status; + + + # write flagfile for successful registration + if ( -d $FFgeneric_dir ) + { + if ( ! -e $FFgeneric || defined $status ) + { + open( FFG, "> $FFgeneric" ); + print FFG "$status_str"; + close FFG; + } + $written = 1; + } + + # this is the old location - will be obsoleted in follwing releases + if ( -d $FFwebyast_dir ) + { + if ( ! -e $FFwebyast || defined $status ) + { + open( FFW, "> $FFwebyast" ); + print FFW "$status_str"; + close FFW; + } + $written = 1; + } + + return $written; +} + +# +# remove both registration flag files +# +# Remove flagfiles that identify a successful registration +# Note: this is only a good guess, only the registration server knows about the status +# (bnc#634026) +# +sub removeregisteredflag() +{ + my $self = shift; + unlink($FFgeneric); + unlink($FFwebyast); +} + +# +# getregisteredflag status +# +# +# Get flagfile status to identify a successful registration +# Note: this is only a good guess, only the registration server knows about the status +# (bnc#634026) +# +sub getregisteredflag() +{ + my $self = shift; + + if ( -e $FFgeneric || -e $FFwebyast ) + { + # write them if only one is found + $self->setregisteredflag(undef); + return 1; + } + return 0; +} + + # # check catalogs # -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62436 - in /branches/SuSE-Code-11-SP1-Branch/registration: VERSION package/yast2-registration.changes src/modules/Register.ycp src/modules/YSR.pm
by jdsn＠svn2.opensuse.org 27 Aug '10

27 Aug '10

Author: jdsn Date: Sat Aug 28 00:50:16 2010 New Revision: 62436 URL: http://svn.opensuse.org/viewcvs/yast?rev=62436&view=rev Log: fix registration status detection, common flag file (bnc#634026) fix proxy settings for WebYaST registrations (bnc#626965) 2.17.35 Modified: branches/SuSE-Code-11-SP1-Branch/registration/VERSION branches/SuSE-Code-11-SP1-Branch/registration/package/yast2-registration.changes branches/SuSE-Code-11-SP1-Branch/registration/src/modules/Register.ycp branches/SuSE-Code-11-SP1-Branch/registration/src/modules/YSR.pm Modified: branches/SuSE-Code-11-SP1-Branch/registration/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/regis… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/registration/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/registration/VERSION Sat Aug 28 00:50:16 2010 @@ -1 +1 @@ -2.17.34 +2.17.35 Modified: branches/SuSE-Code-11-SP1-Branch/registration/package/yast2-registration.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/regis… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/registration/package/yast2-registration.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/registration/package/yast2-registration.changes Sat Aug 28 00:50:16 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Aug 27 20:33:46 CEST 2010 - jdsn(a)suse.de + +- fix registration status detection, common flag file (bnc#634026) +- fix proxy settings for WebYaST registrations (bnc#626965) +- 2.17.35 + +------------------------------------------------------------------- Fri Aug 20 18:01:17 CEST 2010 - jdsn(a)suse.de - use correct error code for backend init errors (bnc#633183) Modified: branches/SuSE-Code-11-SP1-Branch/registration/src/modules/Register.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/regis… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/registration/src/modules/Register.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/registration/src/modules/Register.ycp Sat Aug 28 00:50:16 2010 @@ -1540,8 +1540,9 @@ if ( initialSRstatus == 0 ) { y2milestone("SuseRegister returned with status: %1", initialSRstatus); - // touch webyast flag file to show in webyast that this machine is already registered - SCR::Execute(.target.bash, sformat(" [ -d /var/lib/yastws ] && touch /var/lib/yastws/enable_SLM_webyast_registration_workaround ")); + // touch webyast flag file to show in webyast that this machine is already registered (bnc#634026) + SCR::Execute(.target.bash, " [ -d /var/lib/yastws ] && date +%s > /var/lib/yastws/registration_successful " ); + SCR::Execute(.target.bash, " [ -d /var/lib/suseRegister ] && date +%s > /var/lib/suseRegister/y2_registration_successful " ); } Modified: branches/SuSE-Code-11-SP1-Branch/registration/src/modules/YSR.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/regis… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/registration/src/modules/YSR.pm (original) +++ branches/SuSE-Code-11-SP1-Branch/registration/src/modules/YSR.pm Sat Aug 28 00:50:16 2010 @@ -20,6 +20,12 @@ my $global_ctx = {}; +# flag files for registration status +my $FFwebyast_dir = '/var/lib/yastws'; +my $FFwebyast = $FFwebyast_dir.'/registration_successful'; +my $FFgeneric_dir = '/var/lib/suseRegister'; +my $FFgeneric = $FFgeneric_dir.'/y2_registration_successful'; + # set the PATH in the perl environment (bnc#621914) # otherwise it is empty in system calls $ENV{PATH}="/usr/bin:/sbin:/usr/sbin:/bin"; @@ -185,6 +191,13 @@ } } +BEGIN { $TYPEINFO{unset_proxy} = ["function", "void"]; } +sub unset_proxy +{ + my $self = shift; + delete $ENV{http_proxy}; + delete $ENV{https_proxy}; +} BEGIN { $TYPEINFO{statelessregister} = ["function", [ "map", "string", "any"], ["map", "string", "any"], ["map", "string", "any"]]; } sub statelessregister @@ -192,7 +205,6 @@ my $self = shift; my $ctx = shift; my $arguments = shift; - my $SRregisterFlagFile = '/var/lib/yastws/registration_successful'; unless ( defined $ctx && ref($ctx) eq "HASH" ) { @@ -200,32 +212,30 @@ 'contexterror' => '1' }; } - # check if the system is still initialized - otherwise run init_ctx again - unless ( defined $global_ctx && ref($global_ctx) eq "HASH" && exists $global_ctx->{debug} ) - { - # not initialized - need to reinitialize - - # 1. proxy - if ( exists $ctx->{'proxy'} && ref($ctx->{'proxy'}) eq "HASH" ) - { - my $http = $ctx->{'proxy'}{'http_proxy'} || undef; - my $https = $ctx->{'proxy'}{'https_proxy'} || undef; - $self->set_proxy($http, $https); - } - - # 2. registration context - $self->init_ctx($ctx); - my $init_err = $self->get_errorcode(); - - unless ($init_err == 0) - { - # init failed - return { 'error' => 'The initialization of the registration failed.' - ,'initerror' => $init_err - ,'errorcode' => 199 - }; + # always do a fresh init of proxy and context - otherwise old cached wrong data may be used + # 1. proxy - fixed proxy settings (bnc#626965) + $self->unset_proxy(); + if ( exists $ctx->{'proxy-http_proxy'} || exists $ctx->{'proxy-https_proxy'} ) + { + my $http_proxy = $ctx->{'proxy-http_proxy'} || undef; + my $https_proxy = $ctx->{'proxy-https_proxy'} || undef; + $self->set_proxy($http_proxy, $https_proxy); + delete $ctx->{'proxy-http_proxy'}; + delete $ctx->{'proxy-https_proxy'}; + } + + # 2. registration context + $self->init_ctx($ctx); + my $init_err = $self->get_errorcode(); + + unless ($init_err == 0) + { + # init failed + return { 'error' => 'The initialization of the registration failed.' + ,'initerror' => $init_err + ,'errorcode' => 199 + }; } - } # set arguments # must be set one for one, otherwise other data would be overwritten @@ -262,6 +272,9 @@ ,'manualurl' => $manualurl }; + # we had a new registration process - so we reset the flag files + $self->removeregisteredflag(); + if ( $exitcode == 0 ) { # successful registration, so we need to save the last ZMD config @@ -294,9 +307,7 @@ ${$regret}{'tasklist'} = XMLout( {'item' => $tasklist}, rootname => 'tasklist', KeyAttr => { item => "+ALIAS", catalog => "+ALIAS" }, NoAttr => 1); # write flagfile for successful registration - open(FLAGFILE, "> $SRregisterFlagFile"); - print FLAGFILE localtime(); - close FLAGFILE; + $self->setregisteredflag(1); # to be on the safe side for a following registration request, we need to delete the context data $self->del_ctx(); @@ -348,7 +359,6 @@ my $SRconf = '/etc/suseRegister.conf'; my $SRcert = '/etc/ssl/certs/registration-server.pem'; my $SRcredentials = '/etc/zypp/credentials.d/NCCcredentials'; - my $SRregisterFlagFile = '/var/lib/yastws/registration_successful'; my $url = undef; my $cert = undef; @@ -384,7 +394,7 @@ } # read the guid - if ( -e $SRcredentials && -e $SRregisterFlagFile ) + if ( -e $SRcredentials && $self->getregisteredflag() ) { if (open(CRED, "< $SRcredentials") ) { @@ -404,7 +414,7 @@ $guid = '' unless defined $guid; # delete a flagfile that might be still there if no guid is found - unlink($SRregisterFlagFile) if $guid eq ''; + $self->removeregisteredflag() if $guid eq ''; return { "regserverurl" => $url, "regserverca" => $cert, @@ -493,6 +503,87 @@ return $success; } + +# +# setregisteredflag +# +# Write flagfile to identify a successful registration +# Note: this is only a good guess, only the registration server knows about the status +# (bnc#634026) +# +sub setregisteredflag() +{ + my $self = shift; + my $status = shift; + my $written = 0; + + my $status_str = time(); + $status_str = '' unless defined $status; + + + # write flagfile for successful registration + if ( -d $FFgeneric_dir ) + { + if ( ! -e $FFgeneric || defined $status ) + { + open( FFG, "> $FFgeneric" ); + print FFG "$status_str"; + close FFG; + } + $written = 1; + } + + # this is the old location - will be obsoleted in follwing releases + if ( -d $FFwebyast_dir ) + { + if ( ! -e $FFwebyast || defined $status ) + { + open( FFW, "> $FFwebyast" ); + print FFW "$status_str"; + close FFW; + } + $written = 1; + } + + return $written; +} + +# +# remove both registration flag files +# +# Remove flagfiles that identify a successful registration +# Note: this is only a good guess, only the registration server knows about the status +# (bnc#634026) +# +sub removeregisteredflag() +{ + my $self = shift; + unlink($FFgeneric); + unlink($FFwebyast); +} + +# +# getregisteredflag status +# +# +# Get flagfile status to identify a successful registration +# Note: this is only a good guess, only the registration server knows about the status +# (bnc#634026) +# +sub getregisteredflag() +{ + my $self = shift; + + if ( -e $FFgeneric || -e $FFwebyast ) + { + # write them if only one is found + $self->setregisteredflag(undef); + return 1; + } + return 0; +} + + # # check catalogs # -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62435 - /trunk/registration/src/modules/YSR.pm
by jdsn＠svn2.opensuse.org 26 Aug '10

26 Aug '10

Author: jdsn Date: Thu Aug 26 17:07:17 2010 New Revision: 62435 URL: http://svn.opensuse.org/viewcvs/yast?rev=62435&view=rev Log: fixed proxy settings during webyast registration (bnc#626965) Modified: trunk/registration/src/modules/YSR.pm Modified: trunk/registration/src/modules/YSR.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/src/modules/YSR.pm?… ============================================================================== --- trunk/registration/src/modules/YSR.pm (original) +++ trunk/registration/src/modules/YSR.pm Thu Aug 26 17:07:17 2010 @@ -205,12 +205,14 @@ { # not initialized - need to reinitialize - # 1. proxy - if ( exists $ctx->{'proxy'} && ref($ctx->{'proxy'}) eq "HASH" ) + # 1. proxy - fixed proxy settings (bnc#626965) + if ( exists $ctx->{'proxy-http_proxy'} || exists $ctx->{'proxy-https_proxy'} ) { - my $http = $ctx->{'proxy'}{'http_proxy'} || undef; - my $https = $ctx->{'proxy'}{'https_proxy'} || undef; - $self->set_proxy($http, $https); + my $http_proxy = $ctx->{'proxy-http_proxy'} || undef; + my $https_proxy = $ctx->{'proxy-https_proxy'} || undef; + $self->set_proxy($http_proxy, $https_proxy); + delete $ctx->{'proxy-http_proxy'}; + delete $ctx->{'proxy-https_proxy'}; } # 2. registration context -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62434 - /trunk/autoinstallation/src/include/io.ycp
by elvigia＠svn2.opensuse.org 25 Aug '10

25 Aug '10

Author: elvigia Date: Thu Aug 26 00:35:14 2010 New Revision: 62434 URL: http://svn.opensuse.org/viewcvs/yast?rev=62434&view=rev Log: Mount devices "noatime" during autoinstallation Modified: trunk/autoinstallation/src/include/io.ycp Modified: trunk/autoinstallation/src/include/io.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/include/io.… ============================================================================== --- trunk/autoinstallation/src/include/io.ycp (original) +++ trunk/autoinstallation/src/include/io.ycp Thu Aug 26 00:35:14 2010 @@ -178,8 +178,8 @@ y2milestone("Starting portmap: %1", SCR::Execute (.target.bash, "/sbin/portmap") ); } - if( !(boolean)SCR::Execute(.target.mount, [ Host + ":" + dirname(Path), mount_point ], "-o nolock" ) && - !(boolean)SCR::Execute(.target.mount, [ Host + ":" + dirname(Path), mount_point ], "-t nfs4" ) ) + if( !(boolean)SCR::Execute(.target.mount, [ Host + ":" + dirname(Path), mount_point ], "-o noatime,nolock" ) && + !(boolean)SCR::Execute(.target.mount, [ Host + ":" + dirname(Path), mount_point ], "-o noatime -t nfs4" ) ) { y2warning("Mount failed"); // autoyast tried to mount a NFS directory which failed @@ -210,7 +210,7 @@ else if (Scheme == "cifs") // CIFS { if (!(boolean)SCR::Execute(.target.mount, - [ "//" + Host + dirname(Path), mount_point ], "-t cifs -o guest,ro" )) + [ "//" + Host + dirname(Path), mount_point ], "-t cifs -o guest,ro,noatime" )) { y2warning("Mount failed"); // autoyast tried to mount a NFS directory which failed @@ -314,7 +314,7 @@ y2milestone("already mounted=%1 mountpoint=%2",already_mounted,mount_point); if( ! already_mounted && !(boolean)WFM::Execute(.local.mount, [sformat("/dev/%1", Host), - mount_point]) ) { + mount_point], "-o noatime") ) { y2milestone("%1 is not mounted and mount failed", sformat("/dev/%1", Host)); GET_error = sformat(_("%1 is not mounted and mount failed"), sformat("/dev/%1", Host)); continue; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62433 - in /trunk/installation: src/clients/inst_pre_install.ycp src/inst_finish/umount_finish.ycp src/modules/ImageInstallation.ycp src/modules/SystemFilesCopy.ycp startup/First-Stage/F09-start
by elvigia＠svn2.opensuse.org 25 Aug '10

25 Aug '10

Author: elvigia Date: Wed Aug 25 15:58:20 2010 New Revision: 62433 URL: http://svn.opensuse.org/viewcvs/yast?rev=62433&view=rev Log: Use "noatime" during installation Modified: trunk/installation/src/clients/inst_pre_install.ycp trunk/installation/src/inst_finish/umount_finish.ycp trunk/installation/src/modules/ImageInstallation.ycp trunk/installation/src/modules/SystemFilesCopy.ycp trunk/installation/startup/First-Stage/F09-start Modified: trunk/installation/src/clients/inst_pre_install.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_pr… ============================================================================== --- trunk/installation/src/clients/inst_pre_install.ycp (original) +++ trunk/installation/src/clients/inst_pre_install.ycp Wed Aug 25 15:58:20 2010 @@ -135,7 +135,7 @@ } // mounting read-only - if (! (boolean) SCR::Execute(.target.mount, [partition_device, mnt_tmpdir], "-o ro")) { + if (! (boolean) SCR::Execute(.target.mount, [partition_device, mnt_tmpdir], "-o ro,noatime")) { y2error("Mounting falied!"); return; } Modified: trunk/installation/src/inst_finish/umount_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/inst_finish/umo… ============================================================================== --- trunk/installation/src/inst_finish/umount_finish.ycp (original) +++ trunk/installation/src/inst_finish/umount_finish.ycp Wed Aug 25 15:58:20 2010 @@ -104,7 +104,7 @@ y2milestone ("Cmd: '%1' Ret: %2", cmd, WFM::Execute (.local.bash_output, cmd)); } else { y2warning ("Umount failed, trying to remount read only..."); - string cmd = sformat ("sync; mount -o remount,ro '%1'; umount -l -f '%1';", String::Quote (umount_this)); + string cmd = sformat ("sync; mount -o remount,noatime,ro '%1'; umount -l -f '%1';", String::Quote (umount_this)); y2milestone ("Cmd: '%1' Ret: %2", cmd, WFM::Execute (.local.bash_output, cmd)); } } @@ -146,7 +146,7 @@ y2milestone ("Cmd: '%1' Ret: %2", cmd, WFM::Execute (.local.bash_output, cmd)); } else { y2warning ("Umount failed, trying to remount read only..."); - string cmd = sformat ("mount -o remount,ro '%1'; umount -l -f '%1';", String::Quote (tmp)); + string cmd = sformat ("mount -o remount,ro,noatime '%1'; umount -l -f '%1';", String::Quote (tmp)); y2milestone ("Cmd: '%1' Ret: %2", cmd, WFM::Execute (.local.bash_output, cmd)); } } Modified: trunk/installation/src/modules/ImageInstallation.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/modules/ImageIn… ============================================================================== --- trunk/installation/src/modules/ImageInstallation.ycp (original) +++ trunk/installation/src/modules/ImageInstallation.ycp Wed Aug 25 15:58:20 2010 @@ -376,7 +376,7 @@ y2milestone ("Executing %1 returned %2", cmd, out); y2milestone ("Mounting the image"); - cmd = sformat ("mount -o loop %1 %2", image, tmpdir); + cmd = sformat ("mount -o noatime,loop %1 %2", image, tmpdir); out = (map)SCR::Execute (.target.bash_output, cmd); y2milestone ("Executing %1 returned %2", cmd, out); @@ -426,7 +426,7 @@ string cmd = sformat ("test -d %1 || mkdir -p %1", target); map out = (map)SCR::Execute (.target.bash_output, cmd); y2milestone ("Executing %1 returned %2", cmd, out); - cmd = sformat ("mount -o loop %1 %2", image, target); + cmd = sformat ("mount -o noatime,loop %1 %2", image, target); out = (map)SCR::Execute (.target.bash_output, cmd); y2milestone ("Executing %1 returned %2", cmd, out); return out["exit"]:-1 == 0; Modified: trunk/installation/src/modules/SystemFilesCopy.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/modules/SystemF… ============================================================================== --- trunk/installation/src/modules/SystemFilesCopy.ycp (original) +++ trunk/installation/src/modules/SystemFilesCopy.ycp Wed Aug 25 15:58:20 2010 @@ -140,7 +140,7 @@ ); y2milestone("Mounting %1 to %2", partition, tmp_mount_directory); - if (! (boolean) SCR::Execute(.target.mount, [partition, tmp_mount_directory], "-o ro")) { + if (! (boolean) SCR::Execute(.target.mount, [partition, tmp_mount_directory], "-o ro,noatime")) { y2error("Mounting failed!"); return false; } Modified: trunk/installation/startup/First-Stage/F09-start URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/startup/First-Stage… ============================================================================== --- trunk/installation/startup/First-Stage/F09-start (original) +++ trunk/installation/startup/First-Stage/F09-start Wed Aug 25 15:58:20 2010 @@ -23,7 +23,7 @@ if [ -r /update/y2update/y2update.gz ] ; then gunzip -c /update/y2update/y2update.gz > /dev/ram5 mkdir -p /y2update - if mount /dev/ram5 /y2update ; then + if mount -o noatime /dev/ram5 /y2update ; then log "\tPacked extension disk... OK" UPDATE_MOUNTED=true else -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62432 - /tags/branch-Linux-11_3-2_21_70/gtk/
by rpmcruz＠svn2.opensuse.org 22 Aug '10

22 Aug '10

Author: rpmcruz Date: Mon Aug 23 01:41:39 2010 New Revision: 62432 URL: http://svn.opensuse.org/viewcvs/yast?rev=62432&view=rev Log: Created tag branch-Linux-11_3-2_21_70 for gtk Added: tags/branch-Linux-11_3-2_21_70/gtk/ - copied from r62431, branches/SuSE-Linux-11_3-Branch/gtk/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62431 - /tags/branch-Linux-11_3-2_21_70/
by rpmcruz＠svn2.opensuse.org 22 Aug '10

22 Aug '10

Author: rpmcruz Date: Mon Aug 23 01:41:32 2010 New Revision: 62431 URL: http://svn.opensuse.org/viewcvs/yast?rev=62431&view=rev Log: Created tag branch-Linux-11_3-2_21_70 Added: tags/branch-Linux-11_3-2_21_70/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62430 - in /branches/SuSE-Linux-11_3-Branch/gtk: VERSION VERSION.cmake package/yast2-gtk.changes
by rpmcruz＠svn2.opensuse.org 22 Aug '10

22 Aug '10

Author: rpmcruz Date: Mon Aug 23 01:41:28 2010 New Revision: 62430 URL: http://svn.opensuse.org/viewcvs/yast?rev=62430&view=rev Log: Milestone version. Modified: branches/SuSE-Linux-11_3-Branch/gtk/VERSION branches/SuSE-Linux-11_3-Branch/gtk/VERSION.cmake branches/SuSE-Linux-11_3-Branch/gtk/package/yast2-gtk.changes Modified: branches/SuSE-Linux-11_3-Branch/gtk/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/gtk/VE… ============================================================================== --- branches/SuSE-Linux-11_3-Branch/gtk/VERSION (original) +++ branches/SuSE-Linux-11_3-Branch/gtk/VERSION Mon Aug 23 01:41:28 2010 @@ -1 +1 @@ -2.21.69 +2.21.70 Modified: branches/SuSE-Linux-11_3-Branch/gtk/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/gtk/VE… ============================================================================== --- branches/SuSE-Linux-11_3-Branch/gtk/VERSION.cmake (original) +++ branches/SuSE-Linux-11_3-Branch/gtk/VERSION.cmake Mon Aug 23 01:41:28 2010 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "21") -SET(VERSION_PATCH "69") +SET(VERSION_PATCH "70") Modified: branches/SuSE-Linux-11_3-Branch/gtk/package/yast2-gtk.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/gtk/pa… ============================================================================== --- branches/SuSE-Linux-11_3-Branch/gtk/package/yast2-gtk.changes (original) +++ branches/SuSE-Linux-11_3-Branch/gtk/package/yast2-gtk.changes Mon Aug 23 01:41:28 2010 @@ -1,4 +1,15 @@ ------------------------------------------------------------------- +Mon Aug 23 00:40:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt + +- 2.21.70 +- sw_single: package count wrong on the filters box when +show-debug or show-devel when de-selected (bcn#632377) +- fixed potential crash when file picking file of esoteric +filename (bnc#633173) +- window size too small when using big fonts: correlate +window size to font size (bnc#633498) + +------------------------------------------------------------------- Mon Jul 26 19:28:00 WET 2010 - rpmcruz(a)alunos.dcc.fc.up.pt - 2.21.69 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62429 - in /trunk/gtk/src: ./ pkg/
by rpmcruz＠svn2.opensuse.org 22 Aug '10

22 Aug '10

Author: rpmcruz Date: Mon Aug 23 01:38:22 2010 New Revision: 62429 URL: http://svn.opensuse.org/viewcvs/yast?rev=62429&view=rev Log: * src/YGUI.cc & src/YGDialog.cc: bug fix 633498: set default window size as a proportion of both a constant number of characters and pixels. * src/YGUtils.cc, src/ygtkwizard.c, src/pkg/YGPackageSelector.cc: paned position now set in percent terms. Related to previous item. * src/YGPackageSelector.cc: bug fix 632377: when show-devel or show-debug disabled, then number count in the filters box was not always correct. * src/YGUI.cc: bug fix 633173: ensure file picking dialog doesn't crash when esoteric filename selected. Modified: trunk/gtk/src/YGDialog.cc trunk/gtk/src/YGDialog.h trunk/gtk/src/YGLayout.cc trunk/gtk/src/YGPushButton.cc trunk/gtk/src/YGUI.cc trunk/gtk/src/YGUI.h trunk/gtk/src/YGUtils.cc trunk/gtk/src/YGUtils.h trunk/gtk/src/pkg/YGPackageSelector.cc trunk/gtk/src/pkg/ygtkpkghistorydialog.cc trunk/gtk/src/pkg/ygtkpkgproductdialog.cc trunk/gtk/src/ygtkwizard.c Modified: trunk/gtk/src/YGDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGDialog.cc?rev=62429&r1… ============================================================================== --- trunk/gtk/src/YGDialog.cc (original) +++ trunk/gtk/src/YGDialog.cc Mon Aug 23 01:38:22 2010 @@ -23,6 +23,13 @@ be a YGDialog and is swap-able. */ +//#define DEFAULT_WIDTH 750 +//#define DEFAULT_HEIGHT 650 +#define DEFAULT_CHAR_WIDTH 65 +#define DEFAULT_CHAR_HEIGHT 28 +#define DEFAULT_PIXEL_WIDTH 350 +#define DEFAULT_PIXEL_HEIGHT 200 + class YGWindow; static YGWindow *main_window = 0; @@ -89,24 +96,18 @@ gtk_window_set_decorated (window, FALSE); } - if (_main_window) { - static int width = 0, height; - if (!width) { - int char_width = YGUtils::getCharsWidth (m_widget, 1); - - fprintf (stderr, "char width: %d\n", char_width); - if (char_width < 7) - { width = 750; height = 650; } - else - { width = 800; height = 750; } - if (YGUI::ui()->isPkgSelector()) - height = width; - } + if (_main_window) { + // window default width is calculated as a proportion of a default + // char and pixel width to compensate for the fact that each widget's + // required size comes from a proportion of both parameters + int width = YGUtils::getCharsWidth (m_widget, DEFAULT_CHAR_WIDTH); + width += DEFAULT_PIXEL_WIDTH; + int height = YGUtils::getCharsHeight (m_widget, DEFAULT_CHAR_HEIGHT); + height += DEFAULT_PIXEL_HEIGHT; + + if (YGUI::ui()->isSwsingle()) + height += YGUtils::getCharsHeight (m_widget, 10); - if (YGUI::ui()->defaultWidth()) - width = YGUI::ui()->defaultWidth(); - if (YGUI::ui()->defaultHeight()) - height = YGUI::ui()->defaultHeight(); width = MIN (width, YUI::app()->displayWidth()); height = MIN (height, YUI::app()->displayHeight()); @@ -114,7 +115,7 @@ if (YGUI::ui()->setFullscreen()) gtk_window_fullscreen (window); else if (YUI::app()->displayWidth() <= 800 || YUI::app()->displayHeight() <= 600) - // maximize for small displays + // maximize window for small displays gtk_window_maximize (window); } @@ -364,7 +365,7 @@ m_window->setChild (this); } -void YGDialog::blink() +void YGDialog::present() { GtkWindow *window = GTK_WINDOW (m_window->getWidget()); if (!gtk_window_is_active (window)) @@ -519,7 +520,7 @@ g_free (str); m_stickyTitle = sticky; } - blink(); + present(); } extern "C" { Modified: trunk/gtk/src/YGDialog.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGDialog.h?rev=62429&r1=… ============================================================================== --- trunk/gtk/src/YGDialog.h (original) +++ trunk/gtk/src/YGDialog.h Mon Aug 23 01:38:22 2010 @@ -38,7 +38,7 @@ virtual void openInternal(); virtual void activate(); - void blink(); + void present(); virtual YEvent *waitForEventInternal (int timeout_millisec); virtual YEvent *pollEventInternal(); Modified: trunk/gtk/src/YGLayout.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGLayout.cc?rev=62429&r1… ============================================================================== --- trunk/gtk/src/YGLayout.cc (original) +++ trunk/gtk/src/YGLayout.cc Mon Aug 23 01:38:22 2010 @@ -77,7 +77,7 @@ virtual void doAddChild (YWidget *ychild, GtkWidget *container) { YGWidget::doAddChild (ychild, container); -// if (primary() == YD_HORIZ) + if (primary() == YD_HORIZ) group.addWidget (ychild); } Modified: trunk/gtk/src/YGPushButton.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGPushButton.cc?rev=6242… ============================================================================== --- trunk/gtk/src/YGPushButton.cc (original) +++ trunk/gtk/src/YGPushButton.cc Mon Aug 23 01:38:22 2010 @@ -96,7 +96,7 @@ GtkButton *button = GTK_BUTTON (getWidget()); if (icon.empty()) { m_customIcon = false; - // can't remove image; just hide it + // no need to worry about freeing the image, let it live with button GtkWidget *image = gtk_button_get_image (button); if (image) gtk_widget_hide (image); Modified: trunk/gtk/src/YGUI.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGUI.cc?rev=62429&r1=624… ============================================================================== --- trunk/gtk/src/YGUI.cc (original) +++ trunk/gtk/src/YGUI.cc Mon Aug 23 01:38:22 2010 @@ -25,7 +25,8 @@ static void errorMsg (const char *msg) { GtkWidget* dialog = gtk_message_dialog_new (NULL, - GtkDialogFlags (0), GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "%s", msg); + GtkDialogFlags (0), GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, _("Error")); + gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), msg); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); } @@ -45,8 +46,7 @@ : YUI (with_threads), m_done_init (false), busy_timeout (0) { m_have_wm = true; - m_no_border = m_fullscreen = false; - m_default_width = (m_default_height = 0); + m_no_border = m_fullscreen = m_swsingle = false; YGUI::setTextdomain( TEXTDOMAIN ); @@ -454,11 +454,21 @@ std::string askForFileOrDirectory (GtkFileChooserAction action, const std::string &path, const std::string &filter, const std::string &title) { + GtkWindow *parent = YGDialog::currentWindow(); + const char *button; + switch (action) { + case GTK_FILE_CHOOSER_ACTION_SAVE: + button = GTK_STOCK_SAVE; break; + case GTK_FILE_CHOOSER_ACTION_OPEN: + button = GTK_STOCK_OPEN; break; + case GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER: + case GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER: + button = _("Choose"); break; + } GtkWidget *dialog; dialog = gtk_file_chooser_dialog_new (title.c_str(), - YGDialog::currentWindow(), action, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - action == GTK_FILE_CHOOSER_ACTION_SAVE ? GTK_STOCK_SAVE : GTK_STOCK_OPEN, - GTK_RESPONSE_ACCEPT, NULL); + parent, action, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + button, GTK_RESPONSE_ACCEPT, NULL); GtkFileChooser *fileChooser = GTK_FILE_CHOOSER (dialog); gtk_file_chooser_set_local_only (fileChooser, TRUE); gtk_file_chooser_set_do_overwrite_confirmation (fileChooser, TRUE); @@ -508,8 +518,10 @@ std::string ret; if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) { gchar *filename = gtk_file_chooser_get_filename (fileChooser); - ret = filename; - g_free (filename); + if (filename) { + ret = filename; + g_free (filename); + } } gtk_widget_destroy (dialog); return ret; Modified: trunk/gtk/src/YGUI.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGUI.h?rev=62429&r1=6242… ============================================================================== --- trunk/gtk/src/YGUI.h (original) +++ trunk/gtk/src/YGUI.h Mon Aug 23 01:38:22 2010 @@ -63,17 +63,15 @@ static gboolean busy_timeout_cb (gpointer data); // window-related arguments - bool m_have_wm, m_no_border, m_fullscreen, m_swsingle; - int m_default_width, m_default_height; + bool m_have_wm, m_no_border, m_fullscreen; + bool m_swsingle; public: // Helpers for internal use [ visibility hidden ] bool setFullscreen() const { return m_fullscreen; } bool hasWM() const { return m_have_wm; } bool unsetBorder() const { return m_no_border; } - int defaultWidth() const { return m_default_width; } - int defaultHeight() const { return m_default_height; } - bool isPkgSelector() const { return m_swsingle; } + bool isSwsingle() const { return m_swsingle; } }; // debug helpers. Modified: trunk/gtk/src/YGUtils.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGUtils.cc?rev=62429&r1=… ============================================================================== --- trunk/gtk/src/YGUtils.cc (original) +++ trunk/gtk/src/YGUtils.cc Mon Aug 23 01:38:22 2010 @@ -493,6 +493,31 @@ void ygutils_setWidgetFont (GtkWidget *widget, PangoStyle style, PangoWeight weight, double scale) { YGUtils::setWidgetFont (widget, style, weight, scale); } +static void paned_allocate_cb (GtkWidget *paned, GtkAllocation *alloc, gpointer _rel) +{ + if (!g_object_get_data (G_OBJECT (paned), "init")) { // only once + gdouble rel = GPOINTER_TO_INT (_rel) / 100.; + gint parent_size; + if (gtk_orientable_get_orientation (GTK_ORIENTABLE (paned)) == GTK_ORIENTATION_HORIZONTAL) + parent_size = paned->allocation.width; + else + parent_size = paned->allocation.height; + int pos = parent_size * rel; + gtk_paned_set_position (GTK_PANED (paned), pos); + g_object_set_data (G_OBJECT (paned), "init", GINT_TO_POINTER (1)); + } +} + +void YGUtils::setPaneRelPosition (GtkWidget *paned, gdouble rel) +{ + gint _rel = rel * 100; + g_signal_connect_after (G_OBJECT (paned), "size-allocate", + G_CALLBACK (paned_allocate_cb), GINT_TO_POINTER (_rel)); +} + +void ygutils_setPaneRelPosition (GtkWidget *paned, gdouble rel) +{ YGUtils::setPaneRelPosition (paned, rel); } + GdkPixbuf *YGUtils::loadPixbuf (const string &filename) { GdkPixbuf *pixbuf = NULL; Modified: trunk/gtk/src/YGUtils.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGUtils.h?rev=62429&r1=6… ============================================================================== --- trunk/gtk/src/YGUtils.h (original) +++ trunk/gtk/src/YGUtils.h Mon Aug 23 01:38:22 2010 @@ -44,6 +44,9 @@ /* Sets some widget font proprities. */ void setWidgetFont (GtkWidget *widget, PangoStyle style, PangoWeight weight, double scale); + /* Instead of setting GtkPaned::position in pixels, do so in percents. */ + void setPaneRelPosition (GtkWidget *paned, gdouble rel); + /* Saves some code and standardizes the error. Returns NULL if failed. Don't forget to g_object_unref it! */ GdkPixbuf *loadPixbuf (const std::string &fileneme); @@ -66,6 +69,7 @@ extern "C" { void ygutils_setWidgetFont (GtkWidget *widget, PangoStyle style, PangoWeight weight, double scale); + void ygutils_setPaneRelPosition (GtkWidget *paned, gdouble rel); void ygutils_setFilter (GtkEntry *entry, const char *validChars); Modified: trunk/gtk/src/pkg/YGPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/YGPackageSelector.cc… ============================================================================== --- trunk/gtk/src/pkg/YGPackageSelector.cc (original) +++ trunk/gtk/src/pkg/YGPackageSelector.cc Mon Aug 23 01:38:22 2010 @@ -133,8 +133,7 @@ GtkWidget *vpaned = gtk_vpaned_new(); gtk_paned_pack1 (GTK_PANED (vpaned), list_vbox, TRUE, FALSE); gtk_paned_pack2 (GTK_PANED (vpaned), text, FALSE, TRUE); - g_signal_connect_after (G_OBJECT (vpaned), "size-allocate", - G_CALLBACK (vpaned_allocate_cb), this); + YGUtils::setPaneRelPosition (vpaned, .65); GtkWidget *_vbox = gtk_vbox_new (FALSE, 0); gtk_box_pack_start (GTK_BOX (_vbox), hbox, FALSE, TRUE, 0); @@ -177,14 +176,10 @@ status->select (3); m_queryWidgets.push_back (status); - GtkWidget *vpaned = gtk_vpaned_new(); gtk_paned_pack1 (GTK_PANED (vpaned), m_combo->getWidget(), TRUE, FALSE); gtk_paned_pack2 (GTK_PANED (vpaned), status->getWidget(), FALSE, FALSE); - if (YGUtils::getCharsWidth (vpaned, 1) < 7) - gtk_paned_set_position (GTK_PANED (vpaned), 485); - else - gtk_paned_set_position (GTK_PANED (vpaned), 500); + YGUtils::setPaneRelPosition (vpaned, .80); return vpaned; } @@ -197,10 +192,7 @@ GtkWidget *hpaned = gtk_hpaned_new(); gtk_paned_pack1 (GTK_PANED (hpaned), createSidebar(), FALSE, TRUE); gtk_paned_pack2 (GTK_PANED (hpaned), createMainArea(), TRUE, FALSE); - if (YGUtils::getCharsWidth (hpaned, 1) < 7) - gtk_paned_set_position (GTK_PANED (hpaned), 200); - else - gtk_paned_set_position (GTK_PANED (hpaned), 230); + YGUtils::setPaneRelPosition (hpaned, .28); m_widget = gtk_vbox_new (FALSE, 6); gtk_box_pack_start (GTK_BOX (m_widget), hpaned, TRUE, TRUE, 0); @@ -458,6 +450,7 @@ continue; (*it)->writeQuery (query); } + query.addCriteria (new SuffixFilter (this)); Ypp::List list (query); widget->updateList (list); @@ -581,16 +574,6 @@ // YGPackageSelector complementary methods - static void vpaned_allocate_cb (GtkWidget *vpaned, GtkAllocation *alloc, Impl *pThis) - { - if (!g_object_get_data (G_OBJECT (vpaned), "init")) { // only once - int height = (YGUtils::getCharsWidth (vpaned, 1) < 7) ? 180 : 220; - int pos = MAX (alloc->height / 2, alloc->height - height); - gtk_paned_set_position (GTK_PANED (vpaned), pos); - g_object_set_data (G_OBJECT (vpaned), "init", GINT_TO_POINTER (1)); - } - } - static bool confirmCancel() { GtkWidget *dialog; Modified: trunk/gtk/src/pkg/ygtkpkghistorydialog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkghistorydialog… ============================================================================== --- trunk/gtk/src/pkg/ygtkpkghistorydialog.cc (original) +++ trunk/gtk/src/pkg/ygtkpkghistorydialog.cc Mon Aug 23 01:38:22 2010 @@ -12,6 +12,7 @@ #include "config.h" #include "ygtkpkghistorydialog.h" #include "YGDialog.h" +#include "YGUtils.h" #include "YGPackageSelector.h" #include "ygtkpkglistview.h" #include <gtk/gtk.h> @@ -630,7 +631,7 @@ GtkWidget *hpaned = gtk_hpaned_new(); gtk_paned_pack1 (GTK_PANED (hpaned), date_scroll, FALSE, FALSE); gtk_paned_pack2 (GTK_PANED (hpaned), log_scroll, TRUE, FALSE); - gtk_paned_set_position (GTK_PANED (hpaned), 180); + YGUtils::setPaneRelPosition (hpaned, .30); gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hpaned); gtk_widget_show_all (dialog); Modified: trunk/gtk/src/pkg/ygtkpkgproductdialog.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkgproductdialog… ============================================================================== --- trunk/gtk/src/pkg/ygtkpkgproductdialog.cc (original) +++ trunk/gtk/src/pkg/ygtkpkgproductdialog.cc Mon Aug 23 01:38:22 2010 @@ -11,6 +11,7 @@ #include "YGi18n.h" #include "config.h" #include "YGDialog.h" +#include "YGUtils.h" #include "ygtkpkgproductdialog.h" #include <gtk/gtk.h> #include "ygtkrichtext.h" @@ -165,7 +166,7 @@ GtkWidget *vpaned = gtk_vpaned_new(); gtk_paned_pack1 (GTK_PANED (vpaned), scroll, TRUE, FALSE); gtk_paned_pack2 (GTK_PANED (vpaned), description_scroll, FALSE, TRUE); - gtk_paned_set_position (GTK_PANED (vpaned), 250); + YGUtils::setPaneRelPosition (vpaned, .70); gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), vpaned); gtk_widget_show_all (dialog); Modified: trunk/gtk/src/ygtkwizard.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkwizard.c?rev=62429&r… ============================================================================== --- trunk/gtk/src/ygtkwizard.c (original) +++ trunk/gtk/src/ygtkwizard.c Mon Aug 23 01:38:22 2010 @@ -26,6 +26,7 @@ // YGUtils bridge extern void ygutils_setWidgetFont (GtkWidget *widget, PangoStyle style, PangoWeight weight, double scale); +extern void ygutils_setPaneRelPosition (GtkWidget *paned, gdouble rel); extern const char *ygutils_mapStockIcon (const char *label); extern const char *ygutils_setStockIcon (GtkWidget *button, const char *label, const char *fallbackIcon); @@ -820,7 +821,7 @@ gtk_widget_show_all (scroll); ygtk_wizard_set_control_widget (wizard, scroll); - gtk_paned_set_position (GTK_PANED (wizard->m_pane), 180); + ygutils_setPaneRelPosition (wizard->m_pane, .30); } #define ENABLE_WIDGET(enable, widget) \ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62428 - in /branches/SuSE-Linux-11_3-Branch/gtk: ./ src/ src/pkg/
by rpmcruz＠svn2.opensuse.org 22 Aug '10

22 Aug '10

Author: rpmcruz Date: Mon Aug 23 01:35:34 2010 New Revision: 62428 URL: http://svn.opensuse.org/viewcvs/yast?rev=62428&view=rev Log: * src/YGUI.cc & src/YGDialog.cc: bug fix 633498: set default window size as a proportion of both a constant number of characters and pixels. * src/YGUtils.cc, src/ygtkwizard.c, src/pkg/YGPackageSelector.cc: paned position now set in percent terms. Related to previous item. * src/YGPackageSelector.cc: bug fix 632377: when show-devel or show-debug disabled, then number count in the filters box was not always correct. * src/YGUI.cc: bug fix 633173: ensure file picking dialog doesn't crash when esoteric filename selected. Modified: branches/SuSE-Linux-11_3-Branch/gtk/ChangeLog branches/SuSE-Linux-11_3-Branch/gtk/src/YGDialog.cc branches/SuSE-Linux-11_3-Branch/gtk/src/YGDialog.h branches/SuSE-Linux-11_3-Branch/gtk/src/YGPackageSelectorPluginStub.cc branches/SuSE-Linux-11_3-Branch/gtk/src/YGUI.cc branches/SuSE-Linux-11_3-Branch/gtk/src/YGUI.h branches/SuSE-Linux-11_3-Branch/gtk/src/YGUtils.cc branches/SuSE-Linux-11_3-Branch/gtk/src/YGUtils.h branches/SuSE-Linux-11_3-Branch/gtk/src/pkg/YGPackageSelector.cc branches/SuSE-Linux-11_3-Branch/gtk/src/pkg/ygtkpkghistorydialog.cc branches/SuSE-Linux-11_3-Branch/gtk/src/pkg/ygtkpkgproductdialog.cc branches/SuSE-Linux-11_3-Branch/gtk/src/ygtkwizard.c Modified: branches/SuSE-Linux-11_3-Branch/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/gtk/Ch… ============================================================================== --- branches/SuSE-Linux-11_3-Branch/gtk/ChangeLog (original) +++ branches/SuSE-Linux-11_3-Branch/gtk/ChangeLog Mon Aug 23 01:35:34 2010 @@ -1,3 +1,20 @@ +2010-08-23 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/YGUI.cc & src/YGDialog.cc: bug fix 633498: set + default window size as a proportion of both a constant + number of characters and pixels. + + * src/YGUtils.cc, src/ygtkwizard.c, src/pkg/YGPackageSelector.cc: + paned position now set in percent terms. Related to + previous item. + + * src/YGPackageSelector.cc: bug fix 632377: when + show-devel or show-debug disabled, then number count + in the filters box was not always correct. + + * src/YGUI.cc: bug fix 633173: ensure file picking + dialog doesn't crash when esoteric filename selected. + 2010-07-26 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/pkg/ygtkpkgmenubar.cc: bug fix 624310: file > Modified: branches/SuSE-Linux-11_3-Branch/gtk/src/YGDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/gtk/sr… ============================================================================== --- branches/SuSE-Linux-11_3-Branch/gtk/src/YGDialog.cc (original) +++ branches/SuSE-Linux-11_3-Branch/gtk/src/YGDialog.cc Mon Aug 23 01:35:34 2010 @@ -23,8 +23,12 @@ be a YGDialog and is swap-able. */ -#define DEFAULT_WIDTH 750 -#define DEFAULT_HEIGHT 650 +//#define DEFAULT_WIDTH 750 +//#define DEFAULT_HEIGHT 650 +#define DEFAULT_CHAR_WIDTH 65 +#define DEFAULT_CHAR_HEIGHT 28 +#define DEFAULT_PIXEL_WIDTH 350 +#define DEFAULT_PIXEL_HEIGHT 200 class YGWindow; static YGWindow *main_window = 0; @@ -92,12 +96,18 @@ gtk_window_set_decorated (window, FALSE); } - if (_main_window) { - int width = DEFAULT_WIDTH, height = DEFAULT_HEIGHT; - if (YGUI::ui()->defaultWidth()) - width = YGUI::ui()->defaultWidth(); - if (YGUI::ui()->defaultHeight()) - height = YGUI::ui()->defaultHeight(); + if (_main_window) { + // window default width is calculated as a proportion of a default + // char and pixel width to compensate for the fact that each widget's + // required size comes from a proportion of both parameters + int width = YGUtils::getCharsWidth (m_widget, DEFAULT_CHAR_WIDTH); + width += DEFAULT_PIXEL_WIDTH; + int height = YGUtils::getCharsHeight (m_widget, DEFAULT_CHAR_HEIGHT); + height += DEFAULT_PIXEL_HEIGHT; + + if (YGUI::ui()->isSwsingle()) + height += YGUtils::getCharsHeight (m_widget, 10); + width = MIN (width, YUI::app()->displayWidth()); height = MIN (height, YUI::app()->displayHeight()); @@ -105,7 +115,7 @@ if (YGUI::ui()->setFullscreen()) gtk_window_fullscreen (window); else if (YUI::app()->displayWidth() <= 800 || YUI::app()->displayHeight() <= 600) - // maximize for small displays + // maximize window for small displays gtk_window_maximize (window); } @@ -429,16 +439,6 @@ } } -void YGDialog::setMinSize (int width, int height) -{ - GtkWidget *window = m_window->getWidget(); - width = MIN (width, YUI::app()->displayWidth()); - height = MIN (height, YUI::app()->displayHeight()); - width = MAX (width, window->allocation.width), - height = MAX (height, window->allocation.height); - gtk_window_resize (GTK_WINDOW (window), width, height); -} - void YGDialog::highlight (YWidget *ywidget) { struct inner { Modified: branches/SuSE-Linux-11_3-Branch/gtk/src/YGDialog.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/gtk/sr… ============================================================================== --- branches/SuSE-Linux-11_3-Branch/gtk/src/YGDialog.h (original) +++ branches/SuSE-Linux-11_3-Branch/gtk/src/YGDialog.h Mon Aug 23 01:35:34 2010 @@ -35,7 +35,6 @@ static GtkWindow *currentWindow(); virtual void doSetSize (int width, int height); - void setMinSize (int width, int height); // used internally by YGPackageSelector.cc virtual void openInternal(); virtual void activate(); Modified: branches/SuSE-Linux-11_3-Branch/gtk/src/YGPackageSelectorPluginStub.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/gtk/sr… ============================================================================== --- branches/SuSE-Linux-11_3-Branch/gtk/src/YGPackageSelectorPluginStub.cc (original) +++ branches/SuSE-Linux-11_3-Branch/gtk/src/YGPackageSelectorPluginStub.cc Mon Aug 23 01:35:34 2010 @@ -11,12 +11,6 @@ #include <YEvent.h> #include <string.h> -bool YGUI::pkgSelectorParse (const char *arg) -{ return false; } - -void YGUI::pkgSelectorSize (int *width, int *height) -{ *width = 750; *height = 750; } - class YGPackageSelectorPluginStub : public YPackageSelectorPlugin { YGPackageSelectorPluginIf *impl; Modified: branches/SuSE-Linux-11_3-Branch/gtk/src/YGUI.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/gtk/sr… ============================================================================== --- branches/SuSE-Linux-11_3-Branch/gtk/src/YGUI.cc (original) +++ branches/SuSE-Linux-11_3-Branch/gtk/src/YGUI.cc Mon Aug 23 01:35:34 2010 @@ -25,7 +25,8 @@ static void errorMsg (const char *msg) { GtkWidget* dialog = gtk_message_dialog_new (NULL, - GtkDialogFlags (0), GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "%s", msg); + GtkDialogFlags (0), GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, _("Error")); + gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), msg); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); } @@ -45,8 +46,7 @@ : YUI (with_threads), m_done_init (false), busy_timeout (0) { m_have_wm = true; - m_no_border = m_fullscreen = false; - m_default_width = (m_default_height = 0); + m_no_border = m_fullscreen = m_swsingle = false; YGUI::setTextdomain( TEXTDOMAIN ); @@ -118,7 +118,7 @@ const char *argp = argv[i]; if (argp[0] != '-') { if (!strcmp (argp, "sw_single") || !strcmp (argp, "online_update")) - YGUI::pkgSelectorSize (&m_default_width, &m_default_height); + m_swsingle = true; continue; } argp++; @@ -143,7 +143,6 @@ )); exit (0); } - else if (pkgSelectorParse (argp)) ; } gtk_init (&argc, &argv); @@ -455,11 +454,21 @@ std::string askForFileOrDirectory (GtkFileChooserAction action, const std::string &path, const std::string &filter, const std::string &title) { + GtkWindow *parent = YGDialog::currentWindow(); + const char *button; + switch (action) { + case GTK_FILE_CHOOSER_ACTION_SAVE: + button = GTK_STOCK_SAVE; break; + case GTK_FILE_CHOOSER_ACTION_OPEN: + button = GTK_STOCK_OPEN; break; + case GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER: + case GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER: + button = _("Choose"); break; + } GtkWidget *dialog; dialog = gtk_file_chooser_dialog_new (title.c_str(), - YGDialog::currentWindow(), action, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - action == GTK_FILE_CHOOSER_ACTION_SAVE ? GTK_STOCK_SAVE : GTK_STOCK_OPEN, - GTK_RESPONSE_ACCEPT, NULL); + parent, action, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + button, GTK_RESPONSE_ACCEPT, NULL); GtkFileChooser *fileChooser = GTK_FILE_CHOOSER (dialog); gtk_file_chooser_set_local_only (fileChooser, TRUE); gtk_file_chooser_set_do_overwrite_confirmation (fileChooser, TRUE); @@ -509,8 +518,10 @@ std::string ret; if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) { gchar *filename = gtk_file_chooser_get_filename (fileChooser); - ret = filename; - g_free (filename); + if (filename) { + ret = filename; + g_free (filename); + } } gtk_widget_destroy (dialog); return ret; Modified: branches/SuSE-Linux-11_3-Branch/gtk/src/YGUI.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/gtk/sr… ============================================================================== --- branches/SuSE-Linux-11_3-Branch/gtk/src/YGUI.h (original) +++ branches/SuSE-Linux-11_3-Branch/gtk/src/YGUI.h Mon Aug 23 01:35:34 2010 @@ -64,19 +64,14 @@ // window-related arguments bool m_have_wm, m_no_border, m_fullscreen; - int m_default_width, m_default_height; - - bool pkgSelectorParse (const char *arg); + bool m_swsingle; public: - void pkgSelectorSize (int *width, int *height); - // Helpers for internal use [ visibility hidden ] bool setFullscreen() const { return m_fullscreen; } bool hasWM() const { return m_have_wm; } bool unsetBorder() const { return m_no_border; } - int defaultWidth() const { return m_default_width; } - int defaultHeight() const { return m_default_height; } + bool isSwsingle() const { return m_swsingle; } }; // debug helpers. Modified: branches/SuSE-Linux-11_3-Branch/gtk/src/YGUtils.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/gtk/sr… ============================================================================== --- branches/SuSE-Linux-11_3-Branch/gtk/src/YGUtils.cc (original) +++ branches/SuSE-Linux-11_3-Branch/gtk/src/YGUtils.cc Mon Aug 23 01:35:34 2010 @@ -493,6 +493,31 @@ void ygutils_setWidgetFont (GtkWidget *widget, PangoStyle style, PangoWeight weight, double scale) { YGUtils::setWidgetFont (widget, style, weight, scale); } +static void paned_allocate_cb (GtkWidget *paned, GtkAllocation *alloc, gpointer _rel) +{ + if (!g_object_get_data (G_OBJECT (paned), "init")) { // only once + gdouble rel = GPOINTER_TO_INT (_rel) / 100.; + gint parent_size; + if (gtk_orientable_get_orientation (GTK_ORIENTABLE (paned)) == GTK_ORIENTATION_HORIZONTAL) + parent_size = paned->allocation.width; + else + parent_size = paned->allocation.height; + int pos = parent_size * rel; + gtk_paned_set_position (GTK_PANED (paned), pos); + g_object_set_data (G_OBJECT (paned), "init", GINT_TO_POINTER (1)); + } +} + +void YGUtils::setPaneRelPosition (GtkWidget *paned, gdouble rel) +{ + gint _rel = rel * 100; + g_signal_connect_after (G_OBJECT (paned), "size-allocate", + G_CALLBACK (paned_allocate_cb), GINT_TO_POINTER (_rel)); +} + +void ygutils_setPaneRelPosition (GtkWidget *paned, gdouble rel) +{ YGUtils::setPaneRelPosition (paned, rel); } + GdkPixbuf *YGUtils::loadPixbuf (const string &filename) { GdkPixbuf *pixbuf = NULL; Modified: branches/SuSE-Linux-11_3-Branch/gtk/src/YGUtils.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/gtk/sr… ============================================================================== --- branches/SuSE-Linux-11_3-Branch/gtk/src/YGUtils.h (original) +++ branches/SuSE-Linux-11_3-Branch/gtk/src/YGUtils.h Mon Aug 23 01:35:34 2010 @@ -44,6 +44,9 @@ /* Sets some widget font proprities. */ void setWidgetFont (GtkWidget *widget, PangoStyle style, PangoWeight weight, double scale); + /* Instead of setting GtkPaned::position in pixels, do so in percents. */ + void setPaneRelPosition (GtkWidget *paned, gdouble rel); + /* Saves some code and standardizes the error. Returns NULL if failed. Don't forget to g_object_unref it! */ GdkPixbuf *loadPixbuf (const std::string &fileneme); @@ -66,6 +69,7 @@ extern "C" { void ygutils_setWidgetFont (GtkWidget *widget, PangoStyle style, PangoWeight weight, double scale); + void ygutils_setPaneRelPosition (GtkWidget *paned, gdouble rel); void ygutils_setFilter (GtkEntry *entry, const char *validChars); Modified: branches/SuSE-Linux-11_3-Branch/gtk/src/pkg/YGPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/gtk/sr… ============================================================================== --- branches/SuSE-Linux-11_3-Branch/gtk/src/pkg/YGPackageSelector.cc (original) +++ branches/SuSE-Linux-11_3-Branch/gtk/src/pkg/YGPackageSelector.cc Mon Aug 23 01:35:34 2010 @@ -133,8 +133,7 @@ GtkWidget *vpaned = gtk_vpaned_new(); gtk_paned_pack1 (GTK_PANED (vpaned), list_vbox, TRUE, FALSE); gtk_paned_pack2 (GTK_PANED (vpaned), text, FALSE, TRUE); - g_signal_connect_after (G_OBJECT (vpaned), "size-allocate", - G_CALLBACK (vpaned_allocate_cb), this); + YGUtils::setPaneRelPosition (vpaned, .65); GtkWidget *_vbox = gtk_vbox_new (FALSE, 0); gtk_box_pack_start (GTK_BOX (_vbox), hbox, FALSE, TRUE, 0); @@ -180,7 +179,7 @@ GtkWidget *vpaned = gtk_vpaned_new(); gtk_paned_pack1 (GTK_PANED (vpaned), m_combo->getWidget(), TRUE, FALSE); gtk_paned_pack2 (GTK_PANED (vpaned), status->getWidget(), FALSE, FALSE); - gtk_paned_set_position (GTK_PANED (vpaned), 485); + YGUtils::setPaneRelPosition (vpaned, .80); return vpaned; } @@ -193,7 +192,7 @@ GtkWidget *hpaned = gtk_hpaned_new(); gtk_paned_pack1 (GTK_PANED (hpaned), createSidebar(), FALSE, TRUE); gtk_paned_pack2 (GTK_PANED (hpaned), createMainArea(), TRUE, FALSE); - gtk_paned_set_position (GTK_PANED (hpaned), 200); + YGUtils::setPaneRelPosition (hpaned, .28); m_widget = gtk_vbox_new (FALSE, 6); gtk_box_pack_start (GTK_BOX (m_widget), hpaned, TRUE, TRUE, 0); @@ -451,6 +450,7 @@ continue; (*it)->writeQuery (query); } + query.addCriteria (new SuffixFilter (this)); Ypp::List list (query); widget->updateList (list); @@ -574,15 +574,6 @@ // YGPackageSelector complementary methods - static void vpaned_allocate_cb (GtkWidget *vpaned, GtkAllocation *alloc, Impl *pThis) - { - if (!g_object_get_data (G_OBJECT (vpaned), "init")) { // only once - int pos = MAX (alloc->height / 2, alloc->height - 180); - gtk_paned_set_position (GTK_PANED (vpaned), pos); - g_object_set_data (G_OBJECT (vpaned), "init", GINT_TO_POINTER (1)); - } - } - static bool confirmCancel() { GtkWidget *dialog; @@ -668,9 +659,6 @@ setBorder (0); YGDialog *dialog = YGDialog::currentDialog(); dialog->setCloseCallback (confirm_cb, this); - int width, height; - YGUI::ui()->pkgSelectorSize (&width, &height); - dialog->setMinSize (width, height); const char *icon, *title, **help; if (onlineUpdateMode()) { Modified: branches/SuSE-Linux-11_3-Branch/gtk/src/pkg/ygtkpkghistorydialog.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/gtk/sr… ============================================================================== --- branches/SuSE-Linux-11_3-Branch/gtk/src/pkg/ygtkpkghistorydialog.cc (original) +++ branches/SuSE-Linux-11_3-Branch/gtk/src/pkg/ygtkpkghistorydialog.cc Mon Aug 23 01:35:34 2010 @@ -12,6 +12,7 @@ #include "config.h" #include "ygtkpkghistorydialog.h" #include "YGDialog.h" +#include "YGUtils.h" #include "YGPackageSelector.h" #include "ygtkpkglistview.h" #include <gtk/gtk.h> @@ -630,7 +631,7 @@ GtkWidget *hpaned = gtk_hpaned_new(); gtk_paned_pack1 (GTK_PANED (hpaned), date_scroll, FALSE, FALSE); gtk_paned_pack2 (GTK_PANED (hpaned), log_scroll, TRUE, FALSE); - gtk_paned_set_position (GTK_PANED (hpaned), 180); + YGUtils::setPaneRelPosition (hpaned, .30); gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), hpaned); gtk_widget_show_all (dialog); Modified: branches/SuSE-Linux-11_3-Branch/gtk/src/pkg/ygtkpkgproductdialog.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/gtk/sr… ============================================================================== --- branches/SuSE-Linux-11_3-Branch/gtk/src/pkg/ygtkpkgproductdialog.cc (original) +++ branches/SuSE-Linux-11_3-Branch/gtk/src/pkg/ygtkpkgproductdialog.cc Mon Aug 23 01:35:34 2010 @@ -11,6 +11,7 @@ #include "YGi18n.h" #include "config.h" #include "YGDialog.h" +#include "YGUtils.h" #include "ygtkpkgproductdialog.h" #include <gtk/gtk.h> #include "ygtkrichtext.h" @@ -165,7 +166,7 @@ GtkWidget *vpaned = gtk_vpaned_new(); gtk_paned_pack1 (GTK_PANED (vpaned), scroll, TRUE, FALSE); gtk_paned_pack2 (GTK_PANED (vpaned), description_scroll, FALSE, TRUE); - gtk_paned_set_position (GTK_PANED (vpaned), 250); + YGUtils::setPaneRelPosition (vpaned, .70); gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), vpaned); gtk_widget_show_all (dialog); Modified: branches/SuSE-Linux-11_3-Branch/gtk/src/ygtkwizard.c URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/gtk/sr… ============================================================================== --- branches/SuSE-Linux-11_3-Branch/gtk/src/ygtkwizard.c (original) +++ branches/SuSE-Linux-11_3-Branch/gtk/src/ygtkwizard.c Mon Aug 23 01:35:34 2010 @@ -26,6 +26,7 @@ // YGUtils bridge extern void ygutils_setWidgetFont (GtkWidget *widget, PangoStyle style, PangoWeight weight, double scale); +extern void ygutils_setPaneRelPosition (GtkWidget *paned, gdouble rel); extern const char *ygutils_mapStockIcon (const char *label); extern const char *ygutils_setStockIcon (GtkWidget *button, const char *label, const char *fallbackIcon); @@ -820,7 +821,7 @@ gtk_widget_show_all (scroll); ygtk_wizard_set_control_widget (wizard, scroll); - gtk_paned_set_position (GTK_PANED (wizard->m_pane), 180); + ygutils_setPaneRelPosition (wizard->m_pane, .30); } #define ENABLE_WIDGET(enable, widget) \ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62427 - /tags/branch-Linux-11_2-2_18_4/registration/
by jdsn＠svn.opensuse.org 20 Aug '10

20 Aug '10

Author: jdsn Date: Fri Aug 20 18:42:06 2010 New Revision: 62427 URL: http://svn.opensuse.org/viewcvs/yast?rev=62427&view=rev Log: Created tag branch-Linux-11_2-2_18_4 for registration Added: tags/branch-Linux-11_2-2_18_4/registration/ - copied from r62426, branches/SuSE-Linux-11_2-Branch/registration/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62426 - /tags/branch-Linux-11_2-2_18_4/
by jdsn＠svn.opensuse.org 20 Aug '10

20 Aug '10

Author: jdsn Date: Fri Aug 20 18:42:05 2010 New Revision: 62426 URL: http://svn.opensuse.org/viewcvs/yast?rev=62426&view=rev Log: Created tag branch-Linux-11_2-2_18_4 Added: tags/branch-Linux-11_2-2_18_4/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62425 - in /branches/SuSE-Linux-11_2-Branch/registration: package/yast2-registration.changes src/modules/Register.ycp
by jdsn＠svn.opensuse.org 20 Aug '10

20 Aug '10

Author: jdsn Date: Fri Aug 20 18:41:58 2010 New Revision: 62425 URL: http://svn.opensuse.org/viewcvs/yast?rev=62425&view=rev Log: touch flag file to show in webyast that the system is registered Modified: branches/SuSE-Linux-11_2-Branch/registration/package/yast2-registration.changes branches/SuSE-Linux-11_2-Branch/registration/src/modules/Register.ycp Modified: branches/SuSE-Linux-11_2-Branch/registration/package/yast2-registration.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_2-Branch/regist… ============================================================================== --- branches/SuSE-Linux-11_2-Branch/registration/package/yast2-registration.changes (original) +++ branches/SuSE-Linux-11_2-Branch/registration/package/yast2-registration.changes Fri Aug 20 18:41:58 2010 @@ -2,6 +2,7 @@ Fri Aug 20 18:03:39 CEST 2010 - jdsn(a)suse.de - use correct error code for backend init errors (bnc#633183) +- touch flag file to show in webyast that the system is registered - 2.18.4 ------------------------------------------------------------------- Modified: branches/SuSE-Linux-11_2-Branch/registration/src/modules/Register.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_2-Branch/regist… ============================================================================== --- branches/SuSE-Linux-11_2-Branch/registration/src/modules/Register.ycp (original) +++ branches/SuSE-Linux-11_2-Branch/registration/src/modules/Register.ycp Fri Aug 20 18:41:58 2010 @@ -1521,6 +1521,8 @@ if ( initialSRstatus == 0 ) { y2milestone("SuseRegister returned with status: %1", initialSRstatus); + // touch webyast flag file to show in webyast that this machine is already registered + SCR::Execute(.target.bash, sformat(" [ -d /var/lib/yastws ] && touch /var/lib/yastws/enable_SLM_webyast_registration_workaround ")); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62424 - /tags/branch-Code-11-SP1-2_17_34/registration/
by jdsn＠svn.opensuse.org 20 Aug '10

20 Aug '10

Author: jdsn Date: Fri Aug 20 18:37:49 2010 New Revision: 62424 URL: http://svn.opensuse.org/viewcvs/yast?rev=62424&view=rev Log: Created tag branch-Code-11-SP1-2_17_34 for registration Added: tags/branch-Code-11-SP1-2_17_34/registration/ (props changed) - copied from r62423, branches/SuSE-Code-11-SP1-Branch/registration/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62423 - in /branches/SuSE-Code-11-SP1-Branch/registration: package/yast2-registration.changes src/modules/Register.ycp
by jdsn＠svn.opensuse.org 20 Aug '10

20 Aug '10

Author: jdsn Date: Fri Aug 20 18:37:41 2010 New Revision: 62423 URL: http://svn.opensuse.org/viewcvs/yast?rev=62423&view=rev Log: touch flag file to show in webyast that the system is registered Modified: branches/SuSE-Code-11-SP1-Branch/registration/package/yast2-registration.changes branches/SuSE-Code-11-SP1-Branch/registration/src/modules/Register.ycp Modified: branches/SuSE-Code-11-SP1-Branch/registration/package/yast2-registration.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/regis… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/registration/package/yast2-registration.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/registration/package/yast2-registration.changes Fri Aug 20 18:37:41 2010 @@ -2,6 +2,7 @@ Fri Aug 20 18:01:17 CEST 2010 - jdsn(a)suse.de - use correct error code for backend init errors (bnc#633183) +- touch flag file to show in webyast that the system is registered - 2.17.34 ------------------------------------------------------------------- Modified: branches/SuSE-Code-11-SP1-Branch/registration/src/modules/Register.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/regis… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/registration/src/modules/Register.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/registration/src/modules/Register.ycp Fri Aug 20 18:37:41 2010 @@ -1540,6 +1540,8 @@ if ( initialSRstatus == 0 ) { y2milestone("SuseRegister returned with status: %1", initialSRstatus); + // touch webyast flag file to show in webyast that this machine is already registered + SCR::Execute(.target.bash, sformat(" [ -d /var/lib/yastws ] && touch /var/lib/yastws/enable_SLM_webyast_registration_workaround ")); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62422 - /tags/stable-2_19_6/registration/
by jdsn＠svn.opensuse.org 20 Aug '10

20 Aug '10

Author: jdsn Date: Fri Aug 20 18:28:17 2010 New Revision: 62422 URL: http://svn.opensuse.org/viewcvs/yast?rev=62422&view=rev Log: Created tag stable-2_19_6 for registration Added: tags/stable-2_19_6/registration/ - copied from r62421, trunk/registration/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62421 - /trunk/registration/package/yast2-registration.changes
by jdsn＠svn.opensuse.org 20 Aug '10

20 Aug '10

Author: jdsn Date: Fri Aug 20 18:28:02 2010 New Revision: 62421 URL: http://svn.opensuse.org/viewcvs/yast?rev=62421&view=rev Log: adapt changes file Modified: trunk/registration/package/yast2-registration.changes Modified: trunk/registration/package/yast2-registration.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/package/yast2-regis… ============================================================================== --- trunk/registration/package/yast2-registration.changes (original) +++ trunk/registration/package/yast2-registration.changes Fri Aug 20 18:28:02 2010 @@ -2,6 +2,7 @@ Fri Aug 20 15:45:49 CEST 2010 - jdsn(a)suse.de - use correct error code for backend init errors (bnc#633183) +- touch flag file to show in webyast that the system is registered - 2.19.6 ------------------------------------------------------------------- -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62420 - /trunk/registration/src/modules/Register.ycp
by jdsn＠svn.opensuse.org 20 Aug '10

20 Aug '10

Author: jdsn Date: Fri Aug 20 18:26:43 2010 New Revision: 62420 URL: http://svn.opensuse.org/viewcvs/yast?rev=62420&view=rev Log: touch webyast flag file to show in webyast that this machine is already registered Modified: trunk/registration/src/modules/Register.ycp Modified: trunk/registration/src/modules/Register.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/src/modules/Registe… ============================================================================== --- trunk/registration/src/modules/Register.ycp (original) +++ trunk/registration/src/modules/Register.ycp Fri Aug 20 18:26:43 2010 @@ -1521,6 +1521,8 @@ if ( initialSRstatus == 0 ) { y2milestone("SuseRegister returned with status: %1", initialSRstatus); + // touch webyast flag file to show in webyast that this machine is already registered + SCR::Execute(.target.bash, sformat(" [ -d /var/lib/yastws ] && touch /var/lib/yastws/enable_SLM_webyast_registration_workaround ")); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62419 - in /branches/SuSE-Linux-11_2-Branch/registration: VERSION package/yast2-registration.changes src/modules/YSR.pm
by jdsn＠svn.opensuse.org 20 Aug '10

20 Aug '10

Author: jdsn Date: Fri Aug 20 18:04:26 2010 New Revision: 62419 URL: http://svn.opensuse.org/viewcvs/yast?rev=62419&view=rev Log: use correct error code for backend init errors (bnc#633183) 2.18.4 Modified: branches/SuSE-Linux-11_2-Branch/registration/VERSION branches/SuSE-Linux-11_2-Branch/registration/package/yast2-registration.changes branches/SuSE-Linux-11_2-Branch/registration/src/modules/YSR.pm Modified: branches/SuSE-Linux-11_2-Branch/registration/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_2-Branch/regist… ============================================================================== --- branches/SuSE-Linux-11_2-Branch/registration/VERSION (original) +++ branches/SuSE-Linux-11_2-Branch/registration/VERSION Fri Aug 20 18:04:26 2010 @@ -1 +1 @@ -2.18.3 +2.18.4 Modified: branches/SuSE-Linux-11_2-Branch/registration/package/yast2-registration.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_2-Branch/regist… ============================================================================== --- branches/SuSE-Linux-11_2-Branch/registration/package/yast2-registration.changes (original) +++ branches/SuSE-Linux-11_2-Branch/registration/package/yast2-registration.changes Fri Aug 20 18:04:26 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Aug 20 18:03:39 CEST 2010 - jdsn(a)suse.de + +- use correct error code for backend init errors (bnc#633183) +- 2.18.4 + +------------------------------------------------------------------- Sat Nov 14 04:42:20 CET 2009 - jdsn(a)suse.de - fixes in REST API to prevent server error and loops (bnc#553244) Modified: branches/SuSE-Linux-11_2-Branch/registration/src/modules/YSR.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_2-Branch/regist… ============================================================================== --- branches/SuSE-Linux-11_2-Branch/registration/src/modules/YSR.pm (original) +++ branches/SuSE-Linux-11_2-Branch/registration/src/modules/YSR.pm Fri Aug 20 18:04:26 2010 @@ -219,7 +219,7 @@ # init failed return { 'error' => 'The initialization of the registration failed.' ,'initerror' => $init_err - ,'errorcode' => $init_err + ,'errorcode' => 199 }; } } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62418 - in /branches/SuSE-Code-11-SP1-Branch/registration: VERSION package/yast2-registration.changes src/modules/YSR.pm
by jdsn＠svn.opensuse.org 20 Aug '10

20 Aug '10

Author: jdsn Date: Fri Aug 20 18:02:27 2010 New Revision: 62418 URL: http://svn.opensuse.org/viewcvs/yast?rev=62418&view=rev Log: use correct error code for backend init errors (bnc#633183) 2.17.34 Modified: branches/SuSE-Code-11-SP1-Branch/registration/VERSION branches/SuSE-Code-11-SP1-Branch/registration/package/yast2-registration.changes branches/SuSE-Code-11-SP1-Branch/registration/src/modules/YSR.pm Modified: branches/SuSE-Code-11-SP1-Branch/registration/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/regis… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/registration/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/registration/VERSION Fri Aug 20 18:02:27 2010 @@ -1 +1 @@ -2.17.33 +2.17.34 Modified: branches/SuSE-Code-11-SP1-Branch/registration/package/yast2-registration.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/regis… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/registration/package/yast2-registration.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/registration/package/yast2-registration.changes Fri Aug 20 18:02:27 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Aug 20 18:01:17 CEST 2010 - jdsn(a)suse.de + +- use correct error code for backend init errors (bnc#633183) +- 2.17.34 + +------------------------------------------------------------------- Thu Jul 15 16:17:29 CEST 2010 - jdsn(a)suse.de - fix for the SMT server configuration via WebYaST (bnc#621914) Modified: branches/SuSE-Code-11-SP1-Branch/registration/src/modules/YSR.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/regis… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/registration/src/modules/YSR.pm (original) +++ branches/SuSE-Code-11-SP1-Branch/registration/src/modules/YSR.pm Fri Aug 20 18:02:27 2010 @@ -222,7 +222,7 @@ # init failed return { 'error' => 'The initialization of the registration failed.' ,'initerror' => $init_err - ,'errorcode' => $init_err + ,'errorcode' => 199 }; } } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62417 - in /trunk/registration: VERSION package/yast2-registration.changes src/modules/YSR.pm
by jdsn＠svn.opensuse.org 20 Aug '10

20 Aug '10

Author: jdsn Date: Fri Aug 20 17:59:48 2010 New Revision: 62417 URL: http://svn.opensuse.org/viewcvs/yast?rev=62417&view=rev Log: use correct error code for backend init errors (bnc#633183) 2.19.6 Modified: trunk/registration/VERSION trunk/registration/package/yast2-registration.changes trunk/registration/src/modules/YSR.pm Modified: trunk/registration/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/VERSION?rev=62417&r… ============================================================================== --- trunk/registration/VERSION (original) +++ trunk/registration/VERSION Fri Aug 20 17:59:48 2010 @@ -1 +1 @@ -2.19.5 +2.19.6 Modified: trunk/registration/package/yast2-registration.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/package/yast2-regis… ============================================================================== --- trunk/registration/package/yast2-registration.changes (original) +++ trunk/registration/package/yast2-registration.changes Fri Aug 20 17:59:48 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Aug 20 15:45:49 CEST 2010 - jdsn(a)suse.de + +- use correct error code for backend init errors (bnc#633183) +- 2.19.6 + +------------------------------------------------------------------- Wed Aug 18 15:19:55 CEST 2010 - mzugec(a)suse.cz - fixed typo (bnc#631743) Modified: trunk/registration/src/modules/YSR.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/src/modules/YSR.pm?… ============================================================================== --- trunk/registration/src/modules/YSR.pm (original) +++ trunk/registration/src/modules/YSR.pm Fri Aug 20 17:59:48 2010 @@ -222,7 +222,7 @@ # init failed return { 'error' => 'The initialization of the registration failed.' ,'initerror' => $init_err - ,'errorcode' => $init_err + ,'errorcode' => 199 }; } } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62416 - /tags/stable-2_19_37/network/
by mzugec＠svn.opensuse.org 19 Aug '10

19 Aug '10

Author: mzugec Date: Thu Aug 19 14:10:46 2010 New Revision: 62416 URL: http://svn.opensuse.org/viewcvs/yast?rev=62416&view=rev Log: Created tag stable-2_19_37 for network Added: tags/stable-2_19_37/network/ - copied from r62415, trunk/network/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62415 - /tags/stable-2_19_37/
by mzugec＠svn.opensuse.org 19 Aug '10

19 Aug '10

Author: mzugec Date: Thu Aug 19 14:10:41 2010 New Revision: 62415 URL: http://svn.opensuse.org/viewcvs/yast?rev=62415&view=rev Log: Created tag stable-2_19_37 Added: tags/stable-2_19_37/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62414 - in /trunk/network: VERSION package/yast2-network.changes src/lan/complex.ycp
by mzugec＠svn.opensuse.org 19 Aug '10

19 Aug '10

Author: mzugec Date: Thu Aug 19 14:10:30 2010 New Revision: 62414 URL: http://svn.opensuse.org/viewcvs/yast?rev=62414&view=rev Log: https://bugzilla.novell.com/show_bug.cgi?id=631062 Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/lan/complex.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=62414&r1=624… ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Thu Aug 19 14:10:30 2010 @@ -1 +1 @@ -2.19.36 +2.19.37 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Thu Aug 19 14:10:30 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Aug 19 14:08:33 CEST 2010 - mzugec(a)suse.de + +- warn user about nm-applet/knetworkmanager (bnc#627273) +- 2.19.37 + +------------------------------------------------------------------- Fri Aug 6 13:47:17 CEST 2010 - mzugec(a)suse.cz - Proxy: correctly enclose user:password into quotes (bnc#616695) Modified: trunk/network/src/lan/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/complex.ycp?rev=… ============================================================================== --- trunk/network/src/lan/complex.ycp (original) +++ trunk/network/src/lan/complex.ycp Thu Aug 19 14:10:30 2010 @@ -186,8 +186,10 @@ define void ManagedStore (string key, map event) { string value_g = (string) UI::QueryWidget (`id (key), `CurrentButton); boolean value = value_g == "managed"; - if (NetworkService::IsManaged () != value) + if (NetworkService::IsManaged () != value){ LanItems::SetModified (); + if (value && Stage::normal()) Popup::AnyMessage(_("Applet needed"), _("NetworkManager is controlled by desktop applet\n(knetworkmanager for KDE and nm-applet for GNOME).\nBe sure it's running and if not, start it manually.")); + } NetworkService::SetManaged (value); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62413 - /tags/stable-2_19_5/ncurses-pkg/
by gs＠svn.opensuse.org 19 Aug '10

19 Aug '10

Author: gs Date: Thu Aug 19 13:11:47 2010 New Revision: 62413 URL: http://svn.opensuse.org/viewcvs/yast?rev=62413&view=rev Log: Created tag stable-2_19_5 for ncurses-pkg Added: tags/stable-2_19_5/ncurses-pkg/ - copied from r62412, trunk/ncurses-pkg/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62412 - /tags/stable-2_19_5/ncurses-pkg/
by gs＠svn.opensuse.org 19 Aug '10

19 Aug '10

Author: gs Date: Thu Aug 19 13:09:35 2010 New Revision: 62412 URL: http://svn.opensuse.org/viewcvs/yast?rev=62412&view=rev Log: delete tag (and create tag again with new files) Removed: tags/stable-2_19_5/ncurses-pkg/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62411 - /trunk/ncurses-pkg/src/NCPackageSelectorPluginImpl.cc
by gs＠svn.opensuse.org 19 Aug '10

19 Aug '10

Author: gs Date: Thu Aug 19 13:04:57 2010 New Revision: 62411 URL: http://svn.opensuse.org/viewcvs/yast?rev=62411&view=rev Log: Popup isn't needed here (revert changes) Modified: trunk/ncurses-pkg/src/NCPackageSelectorPluginImpl.cc Modified: trunk/ncurses-pkg/src/NCPackageSelectorPluginImpl.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPackageSelecto… ============================================================================== --- trunk/ncurses-pkg/src/NCPackageSelectorPluginImpl.cc (original) +++ trunk/ncurses-pkg/src/NCPackageSelectorPluginImpl.cc Thu Aug 19 13:04:57 2010 @@ -18,7 +18,6 @@ #include "NCPackageSelectorPluginImpl.h" #include "NCPackageSelectorStart.h" -#include "NCPopupInfo.h" #include <YTableHeader.h> @@ -113,7 +112,6 @@ YWidget * selector ) { NCPackageSelectorStart * ncSelector = 0; - setTextdomain( "ncurses-pkg" ); yuiMilestone() << "Calling runPkgSelection()" << endl; @@ -152,14 +150,6 @@ } catch (const std::exception & e) { - NCPopupInfo * info = new NCPopupInfo ( wpos( NCurses::lines()/10, - NCurses::cols()/10), - NCPkgStrings::ErrorLabel(), - _("Caught an exception:") + (" ") + e.what(), - NCPkgStrings::OKLabel() ); - info->setPreferredSize( 50, 10 ); - info->showInfoPopup(); - YDialog::deleteTopmostDialog(); yuiError() << "Caught a std::exception: " << e.what () << endl; } catch (...) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62410 - /trunk/ncurses-pkg/src/NCPackageSelectorPluginImpl.cc
by gs＠svn.opensuse.org 19 Aug '10

19 Aug '10

Author: gs Date: Thu Aug 19 11:03:47 2010 New Revision: 62410 URL: http://svn.opensuse.org/viewcvs/yast?rev=62410&view=rev Log: add setTextdomain Modified: trunk/ncurses-pkg/src/NCPackageSelectorPluginImpl.cc Modified: trunk/ncurses-pkg/src/NCPackageSelectorPluginImpl.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPackageSelecto… ============================================================================== --- trunk/ncurses-pkg/src/NCPackageSelectorPluginImpl.cc (original) +++ trunk/ncurses-pkg/src/NCPackageSelectorPluginImpl.cc Thu Aug 19 11:03:47 2010 @@ -113,6 +113,7 @@ YWidget * selector ) { NCPackageSelectorStart * ncSelector = 0; + setTextdomain( "ncurses-pkg" ); yuiMilestone() << "Calling runPkgSelection()" << endl; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62409 - /tags/stable-2_19_5/ncurses-pkg/
by gs＠svn.opensuse.org 19 Aug '10

19 Aug '10

Author: gs Date: Thu Aug 19 10:58:42 2010 New Revision: 62409 URL: http://svn.opensuse.org/viewcvs/yast?rev=62409&view=rev Log: Created tag stable-2_19_5 for ncurses-pkg Added: tags/stable-2_19_5/ncurses-pkg/ - copied from r62408, trunk/ncurses-pkg/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62408 - in /trunk/ncurses-pkg: VERSION package/yast2-ncurses-pkg.changes
by gs＠svn.opensuse.org 19 Aug '10

19 Aug '10

Author: gs Date: Thu Aug 19 10:57:22 2010 New Revision: 62408 URL: http://svn.opensuse.org/viewcvs/yast?rev=62408&view=rev Log: 2.19.5 Modified: trunk/ncurses-pkg/VERSION trunk/ncurses-pkg/package/yast2-ncurses-pkg.changes Modified: trunk/ncurses-pkg/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/VERSION?rev=62408&r1… ============================================================================== --- trunk/ncurses-pkg/VERSION (original) +++ trunk/ncurses-pkg/VERSION Thu Aug 19 10:57:22 2010 @@ -1 +1 @@ -2.19.4 +2.19.5 Modified: trunk/ncurses-pkg/package/yast2-ncurses-pkg.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/package/yast2-ncurse… ============================================================================== --- trunk/ncurses-pkg/package/yast2-ncurses-pkg.changes (original) +++ trunk/ncurses-pkg/package/yast2-ncurses-pkg.changes Thu Aug 19 10:57:22 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Aug 19 10:52:26 CEST 2010 - gs(a)suse.de + +- Show error popup if searching for packages throws an exception + (bnc #615102) +- 2.19.5 + +------------------------------------------------------------------- Tue Jul 27 10:59:23 CEST 2010 - gs(a)suse.de - Show all patterns in 'Filter/Patterns' list -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62407 - in /branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src: Dasd.cc Dasd.h Disk.cc Makefile.am ProcPart.cc ProcPart.h
by aschnell＠svn.opensuse.org 19 Aug '10

19 Aug '10

Author: aschnell Date: Thu Aug 19 10:43:51 2010 New Revision: 62407 URL: http://svn.opensuse.org/viewcvs/yast?rev=62407&view=rev Log: - more backports for support of 4k disks Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Dasd.cc branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Dasd.h branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Disk.cc branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Makefile.am branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/ProcPart.cc branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/ProcPart.h Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Dasd.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Dasd.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Dasd.cc Thu Aug 19 10:43:51 2010 @@ -299,15 +299,6 @@ y2milestone( "c:%lu h:%u s:%u", c, h, s ); } -bool Dasd::detectGeometry() - { - Disk::detectGeometry(); - sector *= 8; - byte_cyl *= 8; - cyl /= 8; - y2milestone( "cyl:%lu sector:%u byte_cyl:%lu", cyl, sector, byte_cyl ); - return( true ); - } int Dasd::doResize( Volume* v ) { Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Dasd.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Dasd.h (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Dasd.h Thu Aug 19 10:43:51 2010 @@ -52,7 +52,6 @@ int getToCommit( storage::CommitStage stage, std::list<Container*>& col, std::list<Volume*>& vol ); int commitChanges( storage::CommitStage stage ); - bool detectGeometry(); protected: enum DasdFormat { DASDF_NONE, DASDF_LDL, DASDF_CDL }; Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Disk.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Disk.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Disk.cc Thu Aug 19 10:43:51 2010 @@ -36,7 +36,6 @@ #include "y2storage/Region.h" #include "y2storage/Partition.h" #include "y2storage/ProcPart.h" -#include "y2storage/ProcParts.h" #include "y2storage/Disk.h" #include "y2storage/Storage.h" #include "y2storage/AsciiFile.h" @@ -2280,7 +2279,7 @@ scanPartedLine( *cmd.getLine(0), nr, start, csize, type, id, boot )) { - ProcParts ppart; + ProcPart ppart; y2milestone( "really created at cyl:%ld csize:%ld", start, csize ); p->changeRegion( start, csize, cylinderToKb(csize) ); unsigned long long s=0; @@ -2581,7 +2580,7 @@ { ret = DISK_REMOVE_PARTITION_PARTED_FAILED; } - ProcParts parts; + ProcPart parts; if( parts.findDevice(getPartName(device(), p->OrigNr())) ) callDelpart( p->OrigNr() ); getStorage()->handleHald(false); @@ -3122,6 +3121,7 @@ logfile_name = rhs.logfile_name; sysfs_dir = rhs.sysfs_dir; dmp_slave = rhs.dmp_slave; + no_addpart = rhs.no_addpart; gpt_enlarge = rhs.gpt_enlarge; return( *this ); } Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Makefile.am (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Makefile.am Thu Aug 19 10:43:51 2010 @@ -53,7 +53,6 @@ Regex.cc Regex.h \ AsciiFile.cc AsciiFile.h \ ProcPart.cc ProcPart.h \ - ProcParts.cc ProcParts.h \ EtcRaidtab.cc EtcRaidtab.h \ ProcMounts.cc ProcMounts.h \ EtcFstab.cc EtcFstab.h \ Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/ProcPart.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/ProcPart.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/ProcPart.cc Thu Aug 19 10:43:51 2010 @@ -64,6 +64,14 @@ return( ret ); } + + bool + ProcPart::findDevice(const string& device) const + { + return co.find(devName(device)) != co.end(); + } + + bool ProcPart::getSize( const string& Dev, unsigned long long& SizeK ) const { Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/ProcPart.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/ProcPart.h (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/ProcPart.h Thu Aug 19 10:43:51 2010 @@ -39,6 +39,7 @@ bool getInfo( const string& Dev, unsigned long long& SizeK, unsigned long& Major, unsigned long& Minor ) const; bool getSize( const string& Dev, unsigned long long& SizeK ) const; + bool findDevice(const string& device) const; std::list<string> getMatchingEntries( const string& regexp ) const; protected: static string devName( const string& Dev ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62406 - in /trunk/printer: VERSION package/yast2-printer.changes src/Printer.ycp src/basicadd.ycp src/helps.ycp src/printer_proposal.ycp
by jsmeix＠svn.opensuse.org 18 Aug '10

18 Aug '10

Author: jsmeix Date: Wed Aug 18 16:08:36 2010 New Revision: 62406 URL: http://svn.opensuse.org/viewcvs/yast?rev=62406&view=rev Log: - Added a "Use as Default" check-box below the input field for the queue name in the "Add" dialog and enhanced its help text accordingly (see Novell/openSUSE Bugzilla bnc#631263). - 2.20.1 Modified: trunk/printer/VERSION trunk/printer/package/yast2-printer.changes trunk/printer/src/Printer.ycp trunk/printer/src/basicadd.ycp trunk/printer/src/helps.ycp trunk/printer/src/printer_proposal.ycp Modified: trunk/printer/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/VERSION?rev=62406&r1=624… ============================================================================== --- trunk/printer/VERSION (original) +++ trunk/printer/VERSION Wed Aug 18 16:08:36 2010 @@ -1 +1 @@ -2.20.0 +2.20.1 Modified: trunk/printer/package/yast2-printer.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/package/yast2-printer.ch… ============================================================================== --- trunk/printer/package/yast2-printer.changes (original) +++ trunk/printer/package/yast2-printer.changes Wed Aug 18 16:08:36 2010 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Wed Aug 18 12:20:57 CEST 2010 - jsmeix(a)suse.de + +- Added a "Use as Default" check-box below the input field for + the queue name in the "Add" dialog and enhanced its help text + accordingly (see Novell/openSUSE Bugzilla bnc#631263). +- 2.20.1 + +------------------------------------------------------------------- Tue Aug 10 15:56:38 CEST 2010 - jsmeix(a)suse.de - Added testprint.2pages.ps and enhanced test page printing Modified: trunk/printer/src/Printer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/Printer.ycp?rev=6240… ============================================================================== --- trunk/printer/src/Printer.ycp (original) +++ trunk/printer/src/Printer.ycp Wed Aug 18 16:08:36 2010 @@ -1950,9 +1950,10 @@ * Add new queue or overwrite existing queue * @return true on success */ -global boolean AddQueue( string queue_name, string default_paper_size ) +global boolean AddQueue( string queue_name, boolean is_default_queue, string default_paper_size ) { // Delete ' characters because they are used for quoting in the bash commandline below: queue_name = deletechars( queue_name, "'" ); + default_paper_size = deletechars( default_paper_size, "'" ); string uri = deletechars( connections[selected_connections_index,"uri"]:"", "'" ); string ppd = deletechars( ppds[selected_ppds_index,"ppd"]:"", "'" ); string model = deletechars( connections[selected_connections_index,"model"]:"", "'" ); @@ -1997,6 +1998,15 @@ current_device_uri = ""; return false; } + // If the new queue was created successfully, make it the default queue if this is requested: + if( is_default_queue ) + { // Acording to "man lpadmin" the "-d queue_name" setting does not work intermixed + // with other option settings so that a separate lpadmin command is called: + commandline = "/usr/sbin/lpadmin -h localhost -d '" + queue_name + "'"; + // Do not care if it fails to make it the default queue (i.e. show no error message to the user) + // because the default queue setting is nice to have but not mandatoty for a working queue: + Printerlib::ExecuteBashCommand( commandline ); + } // Try to set the requested default_paper_size if it is an available choice for this queue. // If no default_paper_size is requested, the CUPS default is used. // For the CUPS 1.3 default see http://www.cups.org/str.php?L2846 Modified: trunk/printer/src/basicadd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/basicadd.ycp?rev=624… ============================================================================== --- trunk/printer/src/basicadd.ycp (original) +++ trunk/printer/src/basicadd.ycp Wed Aug 18 16:08:36 2010 @@ -214,15 +214,29 @@ `VStretch(), `Left ( `HBox - ( `ReplacePoint - ( `id(`queue_name_input_replace_point), - `InputField - ( `id(`queue_name_input), - // Avoid that it becomes squeezed to only a few characters in text mode: - `opt(`hstretch), - // Header of a TextEntry to enter the queue name: - _("Set Arbitrary &Name"), - queue_name_proposal + ( `VBox + ( `Left + ( `ReplacePoint + ( `id(`queue_name_input_replace_point), + `InputField + ( `id(`queue_name_input), + // Avoid that it becomes squeezed to only a few characters in text mode: + `opt(`hstretch), + // Header of a TextEntry to enter the queue name: + _("Set Arbitrary &Name"), + queue_name_proposal + ) + ) + ), + `Left + ( `CheckBox + ( `id(`default_queue_checkbox), + // CheckBox to set a local print queue to be the default queue: + _("&Use as Default"), + // When adding a new queue, do not use it as default queue by default + // because this would override an existing default queue setting: + false + ) ) ), `HStretch(), @@ -230,8 +244,8 @@ ( `Right ( `Label ( // Label text to run HPLIP's printer setup tool 'hp-setup' - // to set up HP printers which runs only in English language: - _("Alternative setup for HP printers (English only):") + // to set up HP printers: + _("Alternative setup for HP printers:") ) ), `Right @@ -241,6 +255,14 @@ // Do not change or translate "hp-setup", it is a program name: _("Run &hp-setup") ) + ), + `Right + ( `Label + ( // Label text to inform the user that HPLIP's + // printer setup tool 'hp-setup' runs in English language. + // Do not change or translate "hp-setup", it is a program name: + _("hp-setup runs in English language") + ) ) ) ) @@ -370,6 +392,7 @@ } queue_name = validated_queue_name; } + boolean is_default_queue = (boolean)UI::QueryWidget( `id(`default_queue_checkbox), `Value ); string default_paper_size = ""; any paper_size = UI::QueryWidget( `id(`paper_size_radio_buttons), `CurrentButton ); if( `a4 == paper_size ) @@ -381,7 +404,7 @@ Wizard::DisableBackButton(); Wizard::DisableNextButton(); // No error messages here because Printer::AddQueue already shows them: - Printer::AddQueue( queue_name, default_paper_size ); + Printer::AddQueue( queue_name, is_default_queue, default_paper_size ); // After a local queue was added, enforce to show also local queues // in particular when no local queues were shown before: Printer::queue_filter_show_local = true; Modified: trunk/printer/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/helps.ycp?rev=62406&… ============================================================================== --- trunk/printer/src/helps.ycp (original) +++ trunk/printer/src/helps.ycp Wed Aug 18 16:08:36 2010 @@ -115,7 +115,7 @@ "), "basic_add_dialog" : -// BasicAddDialog help 1/5: +// BasicAddDialog help 1/7: _(" <big>Set Up a New Queue for a Printer Device</big> A printer device is not used directly but via a print queue. @@ -127,16 +127,16 @@ For example a second queue with a monochrome-only driver to enforce black-only printout on a color device or a PostScript queue and a queue with a PCL driver for a PostScript+PCL printer -because printing via the PCL driver is usally faster (but with less quality). +because printing via the PCL driver is usually faster (but with less quality). ") + -// BasicAddDialog help 2/5: +// BasicAddDialog help 2/7: _(" To set up a new queue: Select the connection of the matching printer device, find and assign a suitable printer driver, and set a unique queue name. ") + -// BasicAddDialog help 3/5: +// BasicAddDialog help 3/7: _(" The connection determines which way data is sent to the printer device. If a wrong connection is selected, no data can be sent to the device @@ -150,7 +150,7 @@ (e.g. device status via 'hp-toolbox', or scanning with a HP all-in-one device) the 'hp:/...' connection must be used. ") + -// BasicAddDialog help 4/5: +// BasicAddDialog help 4/7: _(" The driver determines that the right data is produced for the specific printer model. @@ -198,12 +198,41 @@ you must first set up the queue and then in a second step you can adjust all driver options in the 'Edit/Modify' dialog. ") + -// BasicAddDialog help 5/5: +// BasicAddDialog help 5/7: _(" Application programs do not show the actual printer device but its associated queue name. Only letters (a-z and A-Z), numbers (0-9), and the underscore '_' are allowed for the queue name and it must start with a letter. +") + +// BasicAddDialog help 6/7: +_(" +One of the print queues may be set to be used by default. +Application programs should use such a system default print queue +if no other print queue was specified by the user. +But there is no such thing as the 'one and only' default queue. +Beside a system default queue any user can maintain his own +default queue setting and furthermore any application program +may implement its own particular way of default queue setting +(e.g. the application may remember the previously used queue). +For details see the openSUSE support database +article 'Print Settings with CUPS' at +http://en.opensuse.org/SDB:Print_Settings_with_CUPS +") + +// BasicAddDialog help 7/7: +_(" +An alternative way to set up HP devices is to run hp-setup. +HP's own tool 'hp-setup' provides setup support in particular +for HP printers and HP all-in-one devices which require +a proprietary driver plugin to be downloaded from HP and +installed in the right way on a particular end-user's system. +Furthermore 'hp-setup' can provide better setup support +for HP network printers and HP all-in-one network devices +because HP's own tool can implement special handling +for special HP network devices. +For details see the openSUSE support database +article 'How to set-up a HP printer' at +http://en.opensuse.org/SDB:How_to_set-up_a_HP_printer "), "basic_modify_dialog" : Modified: trunk/printer/src/printer_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/printer_proposal.ycp… ============================================================================== --- trunk/printer/src/printer_proposal.ycp (original) +++ trunk/printer/src/printer_proposal.ycp Wed Aug 18 16:08:36 2010 @@ -234,9 +234,12 @@ { y2internal("Selected driver: %1", drivers[0]:nil); // An empty default_paper_size results CUPS's default paper size // (see the Printer::AddQueue function) so that the proposal results the same - // as if the user would have blindly clicked [OK] in the BasicAddDialog: + // as if the user would have blindly clicked [OK] in the BasicAddDialog. + // The BasicAddDialog does by default not set the default queue + // to avoid that a possibly existing default queue gets overwritten. + boolean is_default_queue = false; string default_paper_size = ""; - if( Printer::AddQueue( queue_name, default_paper_size ) ) + if( Printer::AddQueue( queue_name, is_default_queue, default_paper_size ) ) { already_set_up_uris = add( already_set_up_uris, uri ); // Autodetect queues again so that Printer::NewQueueName // can compare with existing queue names but ignore whatever failures -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62405 - /tags/stable-2_19_1/ldap-server/
by mzugec＠svn.opensuse.org 18 Aug '10

18 Aug '10

Author: mzugec Date: Wed Aug 18 15:24:08 2010 New Revision: 62405 URL: http://svn.opensuse.org/viewcvs/yast?rev=62405&view=rev Log: Created tag stable-2_19_1 for ldap-server Added: tags/stable-2_19_1/ldap-server/ (props changed) - copied from r62404, trunk/ldap-server/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62404 - in /trunk/ldap-server: VERSION package/yast2-ldap-server.changes src/dialogs.ycp src/helps.ycp src/widgets.ycp
by mzugec＠svn.opensuse.org 18 Aug '10

18 Aug '10

Author: mzugec Date: Wed Aug 18 15:23:56 2010 New Revision: 62404 URL: http://svn.opensuse.org/viewcvs/yast?rev=62404&view=rev Log: fixed typos (bnc#631743) Modified: trunk/ldap-server/VERSION trunk/ldap-server/package/yast2-ldap-server.changes trunk/ldap-server/src/dialogs.ycp trunk/ldap-server/src/helps.ycp trunk/ldap-server/src/widgets.ycp Modified: trunk/ldap-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/VERSION?rev=62404&r1… ============================================================================== --- trunk/ldap-server/VERSION (original) +++ trunk/ldap-server/VERSION Wed Aug 18 15:23:56 2010 @@ -1 +1 @@ -2.19.0 +2.19.1 Modified: trunk/ldap-server/package/yast2-ldap-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/package/yast2-ldap-s… ============================================================================== --- trunk/ldap-server/package/yast2-ldap-server.changes (original) +++ trunk/ldap-server/package/yast2-ldap-server.changes Wed Aug 18 15:23:56 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Aug 18 15:23:05 CEST 2010 - mzugec(a)suse.cz + +- fixed typos (bnc#631743) +- 2.19.1 + +------------------------------------------------------------------- Thu Jul 22 10:05:25 UTC 2010 - rhafer(a)novell.com - Create LDAP Base objects only after ldap.conf has be written Modified: trunk/ldap-server/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/dialogs.ycp?rev=… ============================================================================== --- trunk/ldap-server/src/dialogs.ycp (original) +++ trunk/ldap-server/src/dialogs.ycp Wed Aug 18 15:23:56 2010 @@ -123,7 +123,7 @@ { if ( name != "daemon" ) { symbol ret = Popup::AnyQuestion3( _("The LDAP Server is not running."), - _("Do you want to start it now to re-read its configuration data or do you want to creat a new configuration from scratch?"), + _("Do you want to start it now to re-read its configuration data or do you want to create a new configuration from scratch?"), _("Restart"), _("New Configuration"), Label::AbortButton(), Modified: trunk/ldap-server/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/helps.ycp?rev=62… ============================================================================== --- trunk/ldap-server/src/helps.ycp (original) +++ trunk/ldap-server/src/helps.ycp Wed Aug 18 15:23:56 2010 @@ -256,7 +256,7 @@ /* Tree Item Dialog "loglevel" */ "g_loglevel" : - _("Selected the subsystems that should log debugging statements and statistics to syslog."), + _("Please select the subsystems that should log debugging statements and statistics to syslog."), /* Tree Item Dialog "allow" 1/1 */ "g_allow" : Modified: trunk/ldap-server/src/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/widgets.ycp?rev=… ============================================================================== --- trunk/ldap-server/src/widgets.ycp (original) +++ trunk/ldap-server/src/widgets.ycp Wed Aug 18 15:23:56 2010 @@ -298,7 +298,7 @@ `Heading( _("Indexing Configuration") ), `Table( `id( `tab_idx ), - `header( _("Attrbute"), _("Presence"), _("Equality"), _("Substring")), + `header( _("Attribute"), _("Presence"), _("Equality"), _("Substring")), [ ] ), `Left( -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62403 - /tags/stable-2_19_5/registration/
by mzugec＠svn.opensuse.org 18 Aug '10

18 Aug '10

Author: mzugec Date: Wed Aug 18 15:20:37 2010 New Revision: 62403 URL: http://svn.opensuse.org/viewcvs/yast?rev=62403&view=rev Log: Created tag stable-2_19_5 for registration Added: tags/stable-2_19_5/registration/ - copied from r62402, trunk/registration/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62402 - in /trunk/registration: VERSION package/yast2-registration.changes src/modules/Register.ycp
by mzugec＠svn.opensuse.org 18 Aug '10

18 Aug '10

Author: mzugec Date: Wed Aug 18 15:20:24 2010 New Revision: 62402 URL: http://svn.opensuse.org/viewcvs/yast?rev=62402&view=rev Log: fixed typo (bnc#631743) Modified: trunk/registration/VERSION trunk/registration/package/yast2-registration.changes trunk/registration/src/modules/Register.ycp Modified: trunk/registration/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/VERSION?rev=62402&r… ============================================================================== --- trunk/registration/VERSION (original) +++ trunk/registration/VERSION Wed Aug 18 15:20:24 2010 @@ -1 +1 @@ -2.19.4 +2.19.5 Modified: trunk/registration/package/yast2-registration.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/package/yast2-regis… ============================================================================== --- trunk/registration/package/yast2-registration.changes (original) +++ trunk/registration/package/yast2-registration.changes Wed Aug 18 15:20:24 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Aug 18 15:19:55 CEST 2010 - mzugec(a)suse.cz + +- fixed typo (bnc#631743) +- 2.19.5 + +------------------------------------------------------------------- Thu Jul 15 16:09:26 CEST 2010 - jdsn(a)suse.de - fix for the SMT server configuration via WebYaST (bnc#621914) Modified: trunk/registration/src/modules/Register.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/src/modules/Registe… ============================================================================== --- trunk/registration/src/modules/Register.ycp (original) +++ trunk/registration/src/modules/Register.ycp Wed Aug 18 15:20:24 2010 @@ -487,7 +487,7 @@ if (ay) return `silentskip; // translators: this is a heading for an error message - so no punctuation - string fileCopyError = _("Could find SMT certificate file in local path"); + string fileCopyError = _("Could not find SMT certificate file in local path"); symbol errret = certificateError( fileCopyError, `file); if ( errret == `yes ) { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62401 - /tags/stable-2_19_0/multipath/
by mzugec＠svn.opensuse.org 18 Aug '10

18 Aug '10

Author: mzugec Date: Wed Aug 18 15:18:14 2010 New Revision: 62401 URL: http://svn.opensuse.org/viewcvs/yast?rev=62401&view=rev Log: Created tag stable-2_19_0 for multipath Added: tags/stable-2_19_0/multipath/ - copied from r62400, trunk/multipath/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62400 - in /trunk/multipath: VERSION package/yast2-multipath.changes src/complex.ycp
by mzugec＠svn.opensuse.org 18 Aug '10

18 Aug '10

Author: mzugec Date: Wed Aug 18 15:17:59 2010 New Revision: 62400 URL: http://svn.opensuse.org/viewcvs/yast?rev=62400&view=rev Log: fixed typo (bnc#631743) Modified: trunk/multipath/VERSION trunk/multipath/package/yast2-multipath.changes trunk/multipath/src/complex.ycp Modified: trunk/multipath/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/multipath/VERSION?rev=62400&r1=6… ============================================================================== --- trunk/multipath/VERSION (original) +++ trunk/multipath/VERSION Wed Aug 18 15:17:59 2010 @@ -1 +1 @@ -2.17.1 +2.19.0 Modified: trunk/multipath/package/yast2-multipath.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/multipath/package/yast2-multipat… ============================================================================== --- trunk/multipath/package/yast2-multipath.changes (original) +++ trunk/multipath/package/yast2-multipath.changes Wed Aug 18 15:17:59 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Aug 18 15:17:26 CEST 2010 - mzugec(a)suse.cz + +- fixed typo (bnc#631743) +- 2.19.0 + +------------------------------------------------------------------- Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz - Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su Modified: trunk/multipath/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/multipath/src/complex.ycp?rev=62… ============================================================================== --- trunk/multipath/src/complex.ycp (original) +++ trunk/multipath/src/complex.ycp Wed Aug 18 15:17:59 2010 @@ -2495,7 +2495,7 @@ vendor_str == e["vendor"]:"NA" && product_str == e["product"]:"NA") { - prop_info = _("Duplicated configuraton"); + prop_info = _("Duplicated configuration"); Popup::Message(prop_info); result = false; break; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62399 - /tags/stable-2_19_4/s390/
by mzugec＠svn.opensuse.org 18 Aug '10

18 Aug '10

Author: mzugec Date: Wed Aug 18 15:15:54 2010 New Revision: 62399 URL: http://svn.opensuse.org/viewcvs/yast?rev=62399&view=rev Log: Created tag stable-2_19_4 for s390 Added: tags/stable-2_19_4/s390/ - copied from r62398, trunk/s390/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62398 - in /trunk/s390: VERSION package/yast2-s390.changes src/modules/Dump.ycp
by mzugec＠svn.opensuse.org 18 Aug '10

18 Aug '10

Author: mzugec Date: Wed Aug 18 15:15:33 2010 New Revision: 62398 URL: http://svn.opensuse.org/viewcvs/yast?rev=62398&view=rev Log: fixed typo (bnc#631743) Modified: trunk/s390/VERSION trunk/s390/package/yast2-s390.changes trunk/s390/src/modules/Dump.ycp Modified: trunk/s390/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/VERSION?rev=62398&r1=62397&… ============================================================================== --- trunk/s390/VERSION (original) +++ trunk/s390/VERSION Wed Aug 18 15:15:33 2010 @@ -1 +1 @@ -2.19.3 +2.19.4 Modified: trunk/s390/package/yast2-s390.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/package/yast2-s390.changes?… ============================================================================== --- trunk/s390/package/yast2-s390.changes (original) +++ trunk/s390/package/yast2-s390.changes Wed Aug 18 15:15:33 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Aug 18 15:14:52 CEST 2010 - mzugec(a)suse.cz + +- fixed typo (bnc#631743) +- 2.19.4 + +------------------------------------------------------------------- Tue Feb 2 16:28:53 CET 2010 - mzugec(a)suse.cz - DASD: support for additional dasd_configure ret codes (bnc#561876) Modified: trunk/s390/src/modules/Dump.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/Dump.ycp?rev=62… ============================================================================== --- trunk/s390/src/modules/Dump.ycp (original) +++ trunk/s390/src/modules/Dump.ycp Wed Aug 18 15:15:33 2010 @@ -126,7 +126,7 @@ err = _("Support program not installed."); else if (ret == 11) // error description - err = _("Invalid or unuseable disk (fatal)."); + err = _("Invalid or unusable disk (fatal)."); else if (ret == 12) // error description err = _("Minor error, can be corrected with -f."); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62397 - in /trunk/ncurses-pkg/src: NCPackageSelectorPluginImpl.cc NCPkgFilterSearch.cc
by gs＠svn.opensuse.org 18 Aug '10

18 Aug '10

Author: gs Date: Wed Aug 18 14:47:28 2010 New Revision: 62397 URL: http://svn.opensuse.org/viewcvs/yast?rev=62397&view=rev Log: show error popup if exception is thrown Modified: trunk/ncurses-pkg/src/NCPackageSelectorPluginImpl.cc trunk/ncurses-pkg/src/NCPkgFilterSearch.cc Modified: trunk/ncurses-pkg/src/NCPackageSelectorPluginImpl.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPackageSelecto… ============================================================================== --- trunk/ncurses-pkg/src/NCPackageSelectorPluginImpl.cc (original) +++ trunk/ncurses-pkg/src/NCPackageSelectorPluginImpl.cc Wed Aug 18 14:47:28 2010 @@ -18,6 +18,7 @@ #include "NCPackageSelectorPluginImpl.h" #include "NCPackageSelectorStart.h" +#include "NCPopupInfo.h" #include <YTableHeader.h> @@ -150,6 +151,14 @@ } catch (const std::exception & e) { + NCPopupInfo * info = new NCPopupInfo ( wpos( NCurses::lines()/10, + NCurses::cols()/10), + NCPkgStrings::ErrorLabel(), + _("Caught an exception:") + (" ") + e.what(), + NCPkgStrings::OKLabel() ); + info->setPreferredSize( 50, 10 ); + info->showInfoPopup(); + YDialog::deleteTopmostDialog(); yuiError() << "Caught a std::exception: " << e.what () << endl; } catch (...) Modified: trunk/ncurses-pkg/src/NCPkgFilterSearch.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgFilterSearc… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgFilterSearch.cc (original) +++ trunk/ncurses-pkg/src/NCPkgFilterSearch.cc Wed Aug 18 14:47:28 2010 @@ -204,13 +204,13 @@ q.addKind( zypp::ResKind::package ); if ( !ignoreCase ) - q.setCaseSensitive(); + q.setCaseSensitive(); if ( checkName ) q.addAttribute( zypp::sat::SolvAttr::name ); if ( checkSummary ) q.addAttribute( zypp::sat::SolvAttr::summary ); if ( checkKeywords ) - q.addAttribute( zypp::sat::SolvAttr::keywords ); + q.addAttribute( zypp::sat::SolvAttr::keywords ); if ( checkDescr ) q.addAttribute( zypp::sat::SolvAttr::description ); if ( checkProvides ) @@ -225,11 +225,28 @@ info->setPreferredSize( 18, 4 ); info->popup(); - for( zypp::PoolQuery::Selectable_iterator it = q.selectableBegin(); - it != q.selectableEnd(); it++) + try { - ZyppPkg pkg = tryCastToZyppPkg( (*it)->theObj() ); - packageList->createListEntry ( pkg, *it); + for( zypp::PoolQuery::Selectable_iterator it = q.selectableBegin(); + it != q.selectableEnd(); it++) + { + ZyppPkg pkg = tryCastToZyppPkg( (*it)->theObj() ); + packageList->createListEntry ( pkg, *it); + } + } + catch (const std::exception & e) + { + NCPopupInfo * info = new NCPopupInfo ( wpos( NCurses::lines()/10, + NCurses::cols()/10), + NCPkgStrings::ErrorLabel(), + // Popup informs the user that the query string + // entered for package search isn't correct + _("Query Error:") + (" ") + e.what(), + NCPkgStrings::OKLabel() ); + info->setPreferredSize( 50, 10 ); + info->showInfoPopup(); + YDialog::deleteTopmostDialog(); + yuiError() << "Caught a std::exception: " << e.what () << endl; } info->popdown(); @@ -245,13 +262,13 @@ if ( found_pkgs > 0 ) { - packageList->setCurrentItem( 0 ); - packageList->showInformation(); + packageList->setCurrentItem( 0 ); + packageList->showInformation(); packageList->setKeyboardFocus(); } else packager->clearInfoArea(); - + return true; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62396 - /trunk/test
by jsrain＠svn.opensuse.org 18 Aug '10

18 Aug '10

Author: jsrain Date: Wed Aug 18 13:59:30 2010 New Revision: 62396 URL: http://svn.opensuse.org/viewcvs/yast?rev=62396&view=rev Log: removed testing file Removed: trunk/test -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62395 - /trunk/test
by jsrain＠svn.opensuse.org 18 Aug '10

18 Aug '10

Author: jsrain Date: Wed Aug 18 13:58:18 2010 New Revision: 62395 URL: http://svn.opensuse.org/viewcvs/yast?rev=62395&view=rev Log: test Modified: trunk/test Modified: trunk/test URL: http://svn.opensuse.org/viewcvs/yast/trunk/test?rev=62395&r1=62394&r2=62395… ============================================================================== --- trunk/test (original) +++ trunk/test Wed Aug 18 13:58:18 2010 @@ -1 +1,3 @@ test +more testing +strings -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62394 - /trunk/test
by jsrain＠svn.opensuse.org 18 Aug '10

18 Aug '10

Author: jsrain Date: Wed Aug 18 13:50:55 2010 New Revision: 62394 URL: http://svn.opensuse.org/viewcvs/yast?rev=3D62394&view=3Drev Log: test Added: trunk/test Added: trunk/test URL: http://svn.opensuse.org/viewcvs/yast/trunk/test?rev=3D62394&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/test (added) +++ trunk/test Wed Aug 18 13:50:55 2010 @@ -0,0 +1 @@ +test -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62391 - in /trunk/ldap-client: VERSION package/yast2-ldap-client.changes src/Ldap.ycp
by jsuchome＠svn.opensuse.org 18 Aug '10

18 Aug '10

Author: jsuchome Date: Wed Aug 18 12:36:09 2010 New Revision: 62391 URL: http://svn.opensuse.org/viewcvs/yast?rev=3D62391&view=3Drev Log: - save certificate info to /etc/openldap/ldap.conf (bnc#629549) - 2.20.0 = Modified: trunk/ldap-client/VERSION trunk/ldap-client/package/yast2-ldap-client.changes trunk/ldap-client/src/Ldap.ycp Modified: trunk/ldap-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/VERSION?rev=3D6= 2391&r1=3D62390&r2=3D62391&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/ldap-client/VERSION (original) +++ trunk/ldap-client/VERSION Wed Aug 18 12:36:09 2010 @@ -1 +1 @@ -2.19.2 +2.20.0 Modified: trunk/ldap-client/package/yast2-ldap-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/package/yast2-l= dap-client.changes?rev=3D62391&r1=3D62390&r2=3D62391&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/ldap-client/package/yast2-ldap-client.changes (original) +++ trunk/ldap-client/package/yast2-ldap-client.changes Wed Aug 18 12:36:09= 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Aug 18 09:37:58 CEST 2010 - jsuchome(a)suse.cz + +- save certificate info to /etc/openldap/ldap.conf (bnc#629549) +- 2.20.0 = + +------------------------------------------------------------------- Wed Jun 23 13:22:18 CEST 2010 - jsuchome(a)suse.cz = - include "Create Home Directory on Login" option in Import/Export Modified: trunk/ldap-client/src/Ldap.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/Ldap.ycp?re= v=3D62391&r1=3D62390&r2=3D62391&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/ldap-client/src/Ldap.ycp (original) +++ trunk/ldap-client/src/Ldap.ycp Wed Aug 18 12:36:09 2010 @@ -1889,6 +1889,12 @@ [server]); SCR::Write(.etc.ldap_conf.v."/etc/openldap/ldap.conf".base, [base_dn]); + + SCR::Write (.etc.ldap_conf.v."/etc/openldap/ldap.conf".TLS_CACERTDIR, + tls_cacertdir =3D=3D "" ? nil : [tls_cacertdir]); + SCR::Write (.etc.ldap_conf.v."/etc/openldap/ldap.conf".TLS_CACERT, + tls_cacertfile =3D=3D "" ? nil : [tls_cacertfile]); + y2milestone ("file /etc/openldap/ldap.conf was modified"); } return write_openldap_conf; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62387 - /trunk/storage/package/yast2-storage.changes
by fehr＠svn.opensuse.org 17 Aug '10

17 Aug '10

Author: fehr Date: Tue Aug 17 11:12:43 2010 New Revision: 62387 URL: http://svn.opensuse.org/viewcvs/yast?rev=62387&view=rev Log: fix typo Modified: trunk/storage/package/yast2-storage.changes Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Tue Aug 17 11:12:43 2010 @@ -19,7 +19,7 @@ ------------------------------------------------------------------- Thu Jul 29 15:53:11 CEST 2010 - fehr(a)suse.de -- fix bug that destroys encrypted volumes when wron password is +- fix bug that destroys encrypted volumes when wrong password is entered in read fstab dialog (#625490) - replace "nofail" with "noauto" for encrypted volumes in fstab during update -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62386 - /tags/branch-SLE-10-SP3-2_13_139/network/
by mzugec＠svn.opensuse.org 17 Aug '10

17 Aug '10

Author: mzugec Date: Tue Aug 17 10:41:01 2010 New Revision: 62386 URL: http://svn.opensuse.org/viewcvs/yast?rev=62386&view=rev Log: Created tag branch-SLE-10-SP3-2_13_139 for network Added: tags/branch-SLE-10-SP3-2_13_139/network/ - copied from r62385, branches/SuSE-SLE-10-SP3-Branch/network/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62385 - /tags/branch-SLE-10-SP3-2_13_139/
by mzugec＠svn.opensuse.org 17 Aug '10

17 Aug '10

Author: mzugec Date: Tue Aug 17 10:40:57 2010 New Revision: 62385 URL: http://svn.opensuse.org/viewcvs/yast?rev=62385&view=rev Log: Created tag branch-SLE-10-SP3-2_13_139 Added: tags/branch-SLE-10-SP3-2_13_139/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62384 - in /branches/SuSE-SLE-10-SP3-Branch/network: VERSION package/yast2-network.changes src/lan/address.ycp
by mzugec＠svn.opensuse.org 17 Aug '10

17 Aug '10

Author: mzugec Date: Tue Aug 17 10:40:37 2010 New Revision: 62384 URL: http://svn.opensuse.org/viewcvs/yast?rev=62384&view=rev Log: L3: allow configured eth device for VLAN (bnc#625103) Modified: branches/SuSE-SLE-10-SP3-Branch/network/VERSION branches/SuSE-SLE-10-SP3-Branch/network/package/yast2-network.changes branches/SuSE-SLE-10-SP3-Branch/network/src/lan/address.ycp Modified: branches/SuSE-SLE-10-SP3-Branch/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/networ… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/network/VERSION (original) +++ branches/SuSE-SLE-10-SP3-Branch/network/VERSION Tue Aug 17 10:40:37 2010 @@ -1 +1 @@ -2.13.138 +2.13.139 Modified: branches/SuSE-SLE-10-SP3-Branch/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/networ… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/network/package/yast2-network.changes (original) +++ branches/SuSE-SLE-10-SP3-Branch/network/package/yast2-network.changes Tue Aug 17 10:40:37 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Aug 17 10:18:13 CEST 2010 - mzugec(a)suse.de + +- L3: allow configured eth device for VLAN (bnc#625103) +- 2.13.139 + +------------------------------------------------------------------- Thu May 27 17:08:23 CEST 2010 - mzugec(a)suse.de - for bonding slaves use BusID based device names (bnc#564370) Modified: branches/SuSE-SLE-10-SP3-Branch/network/src/lan/address.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/networ… ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/network/src/lan/address.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/network/src/lan/address.ycp Tue Aug 17 10:40:37 2010 @@ -144,8 +144,8 @@ foreach(string dev_name, Lan::getUnconfiguredDevices(true),{ items = add(items, `item(`id(dev_name), dev_name, (dev_name==settings["ETHERDEVICE"]:"")?true:false)); }); - // also bond and bridge devices included - foreach(string dev_name, NetworkDevices::List("br|bond"),{ + // also ethernet, bond and bridge devices included + foreach(string dev_name, NetworkDevices::List("eth|br|bond"),{ items = add(items, `item(`id(dev_name), dev_name, (dev_name==settings["ETHERDEVICE"]:"")?true:false)); }); UI::ChangeWidget(`id(key), `Items, items); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62383 - /tags/stable-2_20_0/country/
by jsuchome＠svn.opensuse.org 17 Aug '10

17 Aug '10

Author: jsuchome Date: Tue Aug 17 10:15:41 2010 New Revision: 62383 URL: http://svn.opensuse.org/viewcvs/yast?rev=62383&view=rev Log: Created tag stable-2_20_0 for country Added: tags/stable-2_20_0/country/ - copied from r62382, trunk/country/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62382 - in /trunk/country: VERSION package/yast2-country.changes timezone/src/Timezone.ycp timezone/src/dialogs.ycp
by jsuchome＠svn.opensuse.org 17 Aug '10

17 Aug '10

Author: jsuchome Date: Tue Aug 17 10:15:21 2010 New Revision: 62382 URL: http://svn.opensuse.org/viewcvs/yast?rev=62382&view=rev Log: - mkinitrd call is needed after time change with localtime (bnc#627116) - remember if NTP was set; save NTP settings (bnc#627818) - 2.20.0 Modified: trunk/country/VERSION trunk/country/package/yast2-country.changes trunk/country/timezone/src/Timezone.ycp trunk/country/timezone/src/dialogs.ycp Modified: trunk/country/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/VERSION?rev=62382&r1=623… ============================================================================== --- trunk/country/VERSION (original) +++ trunk/country/VERSION Tue Aug 17 10:15:21 2010 @@ -1 +1 @@ -2.19.18 +2.20.0 Modified: trunk/country/package/yast2-country.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/package/yast2-country.ch… ============================================================================== --- trunk/country/package/yast2-country.changes (original) +++ trunk/country/package/yast2-country.changes Tue Aug 17 10:15:21 2010 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Thu Aug 12 09:05:38 CEST 2010 - jsuchome(a)suse.cz + +- mkinitrd call is needed after time change with localtime + (bnc#627116) +- remember if NTP was set; save NTP settings (bnc#627818) +- 2.20.0 + +------------------------------------------------------------------- Tue Aug 3 15:26:11 CEST 2010 - jsuchome(a)suse.cz - in text mode, set the timezone when leaving dialog (bnc#617861) Modified: trunk/country/timezone/src/Timezone.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/timezone/src/Timezone.yc… ============================================================================== --- trunk/country/timezone/src/Timezone.ycp (original) +++ trunk/country/timezone/src/Timezone.ycp Tue Aug 17 10:15:21 2010 @@ -370,6 +370,14 @@ return; } +global boolean CallMkinitrd () { + + y2milestone ("calling mkinitrd..."); + SCR::Execute (.target.bash, "/sbin/mkinitrd >> /var/log/YaST2/y2logmkinitrd 2>> /var/log/YaST2/y2logmkinitrd"); + y2milestone ("... done"); + return true; +} + /** * Set the new time and date given by user */ Modified: trunk/country/timezone/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/timezone/src/dialogs.ycp… ============================================================================== --- trunk/country/timezone/src/dialogs.ycp (original) +++ trunk/country/timezone/src/dialogs.ycp Tue Aug 17 10:15:21 2010 @@ -42,6 +42,9 @@ // if packages for NTP configuration are installed boolean ntp_installed = false; + // when checking for NTP status for first time, check the service status + boolean ntp_first_time = true; + /** * helper function for seting the time related stuff in module and possibly * adapting current time according to it @@ -264,7 +267,8 @@ ntp_rb = (boolean) ntp_call ("ui_init", $[ "replace_point": `id (`rp), "country" : Language::GetLanguageCountry(), - /*WTF*/"first_time" : true ]); + "first_time" : ntp_first_time ]); + ntp_first_time = false; UI::ChangeWidget(`id(`rb), `CurrentButton, (ntp_rb ? `ntp : `manual)); if (!dt_widgets) @@ -321,7 +325,7 @@ // before the sync, save the time zone (bnc#467318) Timezone::Set (Timezone::timezone, Stage::initial () && !Mode::live_installation ()); // true: go on, exit; false: loop on - boolean ntp_handled = (boolean) ntp_call ("ui_try_save", $[ "ntpdate_only" : true]); + boolean ntp_handled = (boolean) ntp_call ("ui_try_save", $[]); if (!ntp_handled) ret = `retry; // loop on else @@ -378,7 +382,21 @@ } else { + // in case of local time, we need to call mkinitrd (after setting timezone) + if (Timezone::hwclock == "--localtime" && !Stage::initial ()) + { + Timezone::Set (Timezone::timezone, true); + } + Timezone::SetTime( year, month, day, hour, minute, second ); + + if (Timezone::hwclock == "--localtime" && !Stage::initial ()) + { + // busy message + Popup::ShowFeedback ("", _("Updating initrd...")); + Timezone::CallMkinitrd (); + Popup::ClearFeedback (); + } } } } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62381 - /tags/stable-2_20_1/security/
by jsuchome＠svn.opensuse.org 16 Aug '10

16 Aug '10

Author: jsuchome Date: Mon Aug 16 13:32:13 2010 New Revision: 62381 URL: http://svn.opensuse.org/viewcvs/yast?rev=62381&view=rev Log: Created tag stable-2_20_1 for security Added: tags/stable-2_20_1/security/ - copied from r62380, trunk/security/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62380 - in /trunk/security: VERSION package/yast2-security.changes src/dialogs.ycp
by jsuchome＠svn.opensuse.org 16 Aug '10

16 Aug '10

Author: jsuchome Date: Mon Aug 16 13:31:53 2010 New Revision: 62380 URL: http://svn.opensuse.org/viewcvs/yast?rev=62380&view=rev Log: - removed 'disable' from descriptions of settings (bnc#610944) - 2.20.1 Modified: trunk/security/VERSION trunk/security/package/yast2-security.changes trunk/security/src/dialogs.ycp Modified: trunk/security/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/security/VERSION?rev=62380&r1=62… ============================================================================== --- trunk/security/VERSION (original) +++ trunk/security/VERSION Mon Aug 16 13:31:53 2010 @@ -1 +1 @@ -2.20.0 +2.20.1 Modified: trunk/security/package/yast2-security.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/security/package/yast2-security.… ============================================================================== --- trunk/security/package/yast2-security.changes (original) +++ trunk/security/package/yast2-security.changes Mon Aug 16 13:31:53 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Aug 16 13:30:29 CEST 2010 - jsuchome(a)suse.cz + +- removed 'disable' from descriptions of settings (bnc#610944) +- 2.20.1 + +------------------------------------------------------------------- Fri Aug 6 11:07:49 CEST 2010 - jsuchome(a)suse.cz - testsuite adapted to changes in yast2-pam Modified: trunk/security/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/security/src/dialogs.ycp?rev=623… ============================================================================== --- trunk/security/src/dialogs.ycp (original) +++ trunk/security/src/dialogs.ycp Mon Aug 16 13:31:53 2010 @@ -72,14 +72,14 @@ "SYSLOG_ON_NO_ERROR" : _("Always generate syslog message for cron scripts"), "DHCPD_RUN_CHROOTED" : _("Run the DHCP daemon in a chroot"), "DHCPD_RUN_AS" : _("Run the DHCP daemon as dhcp user"), - "DISPLAYMANAGER_ROOT_LOGIN_REMOTE" : _("Disable remote root login in the display manager"), - "DISPLAYMANAGER_XSERVER_TCP_PORT_6000_OPEN" : _("Disable remote access to the X server"), + "DISPLAYMANAGER_ROOT_LOGIN_REMOTE" : _("Remote root login in the display manager"), + "DISPLAYMANAGER_XSERVER_TCP_PORT_6000_OPEN" : _("Remote access to the X server"), "SMTPD_LISTEN_REMOTE" : _("Remote access to the email delivery subsystem"), - "DISABLE_RESTART_ON_UPDATE" : _("Disable service restart on update"), - "DISABLE_STOP_ON_REMOVAL" : _("Disable service stop on removal"), + "DISABLE_RESTART_ON_UPDATE" : _("Restart services on update"), + "DISABLE_STOP_ON_REMOVAL" : _("Stop services on removal"), "IP_TCP_SYNCOOKIES" : _("Enable TCP syncookies"), - "IP_FORWARD" : _("Disable IPv4 forwarding"), - "IPV6_FORWARD" : _("Disable IPv6 forwarding"), + "IP_FORWARD" : _("IPv4 forwarding"), + "IPV6_FORWARD" : _("IPv6 forwarding"), "RUNLEVEL3_MANDATORY_SERVICES" : _("Enable basic system services in runlevel 3\n (multiuser with network)"), "RUNLEVEL5_MANDATORY_SERVICES" : _("Enable basic system services in runlevel 5\n (multiuser with network and graphical login)"), "RUNLEVEL3_EXTRA_SERVICES" : _("Enable extra services in runlevel 3"), -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62379 - in /trunk/storage: package/yast2-storage.changes storage/src/modules/FileSystems.ycp
by fehr＠svn.opensuse.org 10 Aug '10

10 Aug '10

Author: fehr Date: Tue Aug 10 17:07:54 2010 New Revision: 62379 URL: http://svn.opensuse.org/viewcvs/yast?rev=62379&view=rev Log: supressing journal makes sense only for ext4 since ext3 without journal is just ext2 Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/modules/FileSystems.ycp Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Tue Aug 10 17:07:54 2010 @@ -2,7 +2,7 @@ Mon Aug 9 13:38:45 CEST 2010 - fehr(a)suse.de - make mkfs option "dir_index" work as expected again -- add option to supress journal to mkfs options for ext3 and ext4 +- add option to supress journal to mkfs options for ext4 (bnc#629363) ------------------------------------------------------------------- Modified: trunk/storage/storage/src/modules/FileSystems.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/File… ============================================================================== --- trunk/storage/storage/src/modules/FileSystems.ycp (original) +++ trunk/storage/storage/src/modules/FileSystems.ycp Tue Aug 10 17:07:54 2010 @@ -593,7 +593,10 @@ // help text, richtext format `help_text : _("Directory Index: Enables use of hashed b-trees to speed up lookups in large directories.\n") - ], + ] + ]; + +list< map<symbol, any> > ext4_only_options = [ $[ // label text `widget : `CheckBox(`id("no_journal"), `opt(`hstretch), _("&No Journal")), @@ -606,10 +609,11 @@ Suppressed use of journaling on filesystem. Only activate this when you really know what you are doing.\n") ] - ]; + ]; list< map<symbol, any> > ext3_options = (list< map<symbol, any> >)merge( ext2_options, ext3_only_options ); list< map<symbol, any> > ext4_options = (list< map<symbol, any> >)merge( ext2_options, ext3_only_options ); + ext4_options = (list< map<symbol, any> >)merge( ext4_options, ext4_only_options ); list< map<symbol, any> > ext2_fst_options = [ ]; list< map<symbol, any> > ext3_fst_options = [ ]; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62378 - /trunk/printer/yast2-printer.spec.in
by jsmeix＠svn.opensuse.org 10 Aug '10

10 Aug '10

Author: jsmeix Date: Tue Aug 10 16:31:05 2010 New Revision: 62378 URL: http://svn.opensuse.org/viewcvs/yast?rev=62378&view=rev Log: - Added '@ydatadir@/testprint.2pages.ps' to yast2-printer.spec.in so that the new test page gets packaged in the RPM. Modified: trunk/printer/yast2-printer.spec.in Modified: trunk/printer/yast2-printer.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/yast2-printer.spec.in?re… ============================================================================== --- trunk/printer/yast2-printer.spec.in (original) +++ trunk/printer/yast2-printer.spec.in Tue Aug 10 16:31:05 2010 @@ -52,6 +52,7 @@ @yncludedir@/printer/* @schemadir@/autoyast/rnc/printer.rnc @ydatadir@/testprint.ps +@ydatadir@/testprint.2pages.ps @ybindir@/autodetect_print_queues @ybindir@/autodetect_printers @ybindir@/create_printer_ppd_database -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62377 - in /trunk/printer: data/Makefile.am data/testprint.2pages.ps package/yast2-printer.changes src/overview.ycp
by jsmeix＠svn.opensuse.org 10 Aug '10

10 Aug '10

Author: jsmeix Date: Tue Aug 10 16:16:58 2010 New Revision: 62377 URL: http://svn.opensuse.org/viewcvs/yast?rev=62377&view=rev Log: - Added testprint.2pages.ps and enhanced test page printing in overview.ycp to let the user choose to print one (default) or two pages test print e.g. to test duplex printing (see Novell/Suse Bugzilla bnc#629160). Added: trunk/printer/data/testprint.2pages.ps Modified: trunk/printer/data/Makefile.am trunk/printer/package/yast2-printer.changes trunk/printer/src/overview.ycp Modified: trunk/printer/data/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/data/Makefile.am?rev=623… ============================================================================== --- trunk/printer/data/Makefile.am (original) +++ trunk/printer/data/Makefile.am Tue Aug 10 16:16:58 2010 @@ -1,5 +1,6 @@ # Makefile.am for printer/data -ydata_DATA = testprint.ps +ydata_DATA = testprint.ps \ + testprint.2pages.ps EXTRA_DIST = $(ydata_DATA) Added: trunk/printer/data/testprint.2pages.ps URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/data/testprint.2pages.ps… ============================================================================== --- trunk/printer/data/testprint.2pages.ps (added) +++ trunk/printer/data/testprint.2pages.ps Tue Aug 10 16:16:58 2010 @@ -0,0 +1,1065 @@ +%!PS-Adobe-3.0 +%%BoundingBox: 0 0 612 792 +%%Pages: 2 +%%LanguageLevel: 1 +%%DocumentData: Clean7Bit +%%DocumentSuppliedResources: procset testprint/1.3 +%%DocumentNeededResources: font Helvetica Helvetica-Bold Times-Roman +%%Creator: Michael Sweet, Apple Inc. +%%CreationDate: D:20090113092400+0800 +%%Title: Test Page +%%EndComments +%%BeginProlog +%%BeginResource procset testprint 1.3 0 +% +% PostScript test page for the Common UNIX Printing System ("CUPS"). +% +% Copyright 2007-2010 Apple Inc. +% Copyright 1993-2007 Easy Software Products +% +% These coded instructions, statements, and computer programs are the +% property of Apple Inc. and are protected by Federal copyright law. +% Distribution and use rights are outlined in the file "LICENSE.txt" +% which is included with the CUPS source distribution. +% +/SEXTANT { % Draw a color wheel sextant... + % (name) white radius r g b SEXTANT - + % Loop through 100 shades... + 0 0.010101 0.98 { + % Set the color... + dup 0.75 le { % Get "white" value + % Start from black + dup 0.75 div % val2 = val / 0.75 + + 0 index 5 index mul % R = R * val2 + 1 index 5 index mul % G = G * val2 + 2 index 5 index mul % B = B * val2 + + 4 -1 roll pop % Discard val2 + } { + % Fade to white + dup neg 1 add 4 mul % val2 = (1 - val) * 4 + + 0 index 5 index mul % R = R * val2 + 1 index neg 1 add add % + (1 - val2) + 1 index 5 index mul % G = G * val2 + 2 index neg 1 add add % + (1 - val2) + 2 index 5 index mul % B = B * val2 + 3 index neg 1 add add % + (1 - val2) + + 4 -1 roll pop % Discard val2 + } ifelse + setrgbcolor % Set the color... + + % Draw the polygon... + newpath % Start a new path... + dup 5 index mul % r1 = radius * val + 0 0 3 -1 roll 0 60 arc % Draw the inner arc + + dup 0.010101 add 5 index mul% r2 = (radius + 0.010101) * val + 0 0 3 -1 roll 60 0 arcn % Draw the outer arc + + closepath % Close the path + fill % Fill it... + + pop % Pop value... + } for + + % Draw a line around the polygons... + pop pop pop dup % Pop R, G, B, start + 0 setgray % Black + newpath + 0 0 moveto % Center + 0 0 3 -1 roll 0 60 arc % Arc around octant + closepath % Back to center + stroke % Stroke it... + + % Draw the label... + dup % Save radius + dup 30 cos mul % X = radius * cos(30) + exch 30 sin mul % Y = radius * sin(30) + moveto % Position label + + gsave + 30 rotate % Rotate label + dup 0.05 mul % Offset to the right + exch -0.05 mul % and down... + rmoveto % Offset label + show % Show label + grestore +} bind def +/CENTER { % Draw centered text + % (name) CENTER - + dup stringwidth pop % Get the width of the string + 0.5 mul neg 0 rmoveto % Shift left 1/2 of the distance + show % Show the string +} bind def +/RIGHT { % Draw right-justified text + % (name) RIGHT - + dup stringwidth pop % Get the width of the string + neg 0 rmoveto % Shift left the entire distance + show % Show the string +} bind def +/NUMBER { % Draw a number + % power n NUMBER - + 1 index 1 eq { % power == 1? + round cvi exch pop % Convert "n" to integer + } { + 1 index mul round exch div % Truncate extra decimal places + } ifelse + 100 string cvs show % Convert to a string and show it... +} bind def +/CUPSLOGO { % Draw the CUPS logo + % height CUPSLOGO + % Start with a big C... + /Helvetica findfont 1 index scalefont setfont + 0 setgray + 0 0 moveto + (C) show + + % Then "UNIX Printing System" much smaller... + /Helvetica-Bold findfont 1 index 9 div scalefont setfont + 0.25 mul + dup dup 2.0 mul moveto + (UNIX) show + dup dup 1.6 mul moveto + (Printing) show + dup 1.2 mul moveto + (System) show +} bind def +%%EndResource +%%EndProlog + +% The first page: +%%Page: 1 1 +gsave + + % Determine the imageable area and device resolution... + initclip newpath clippath pathbbox % Get bounding rectangle + 72 div /pageTop exch def % Get top margin in inches + 72 div /pageRight exch def % Get right margin in inches + 72 div /pageBottom exch def % Get bottom margin in inches + 72 div /pageLeft exch def % Get left margin in inches + + 4 setlinewidth % Draw wide lines + 0 setgray closepath stroke % Draw a clipping rectangle + + /pageWidth pageRight pageLeft sub def % pageWidth = pageRight - pageLeft + /pageHeight pageTop pageBottom sub def% pageHeight = pageTop - pageBottom + + 72 72 dtransform % Get device resolution per inch + /yResolution exch abs def % yResolution = abs(yres) + /xResolution exch abs def % xResolution = abs(xres) + + % Figure out the sizes of things... + /wheelSize % size of wheels + pageWidth pageHeight lt + { pageWidth 9 mul } + { pageHeight 7 mul } + ifelse def + + % Create fonts... + /bigFont /Helvetica-Bold findfont % bigFont = Helvetica-Bold + pageHeight 3 mul scalefont def % size = pageHeight * 3 (nominally 33) + + /mediumFont /Helvetica findfont % mediumFont = Helvetica + pageHeight 1.5 mul scalefont def % size = pageHeight * 1.5 (nominally 16.5) + + /smallFont /Times-Roman findfont % smallFont = Times-Roman + pageHeight scalefont def % size = pageHeight (nominally 11) + + % Draw rulers along the edges... + /CENTIMETER 72 2.54 div def + /MILLIMETER 72 25.4 div def + + /Times-Roman findfont % Font for ruler numbers + 11 scalefont setfont % 11 points + + gsave % Left side inches + pageLeft 72 mul 0 translate % Offset left edge + + 1 setlinewidth % Draw normal lines + 72 72 pageTop 72 mul { % Height inches + dup dup + 0 exch moveto 24 0 rlineto stroke % Draw tic mark + 24 exch pageHeight sub moveto % Draw number + 72 div cvi 10 string cvs RIGHT + } for + + 0.5 setlinewidth % Draw thin lines + 18 18 pageTop 72 mul { % 1/4 inches + 0 exch moveto 15 0 rlineto stroke % Draw tic mark + } for + + 9 9 pageTop 72 mul { % 1/8 inches + 0 exch moveto 6 0 rlineto stroke % Draw tic mark + } for + grestore + + gsave % Bottom inches + 0 pageBottom 72 mul translate % Offset bottom edge + + 1 setlinewidth % Draw normal lines + 72 72 pageRight 72 mul { % Width inches + dup dup + 0 moveto 0 24 rlineto stroke % Draw tic mark + 3 add 27 pageHeight sub moveto % Draw number + 72 div cvi 10 string cvs show + } for + + 0.5 setlinewidth % Draw thin lines + 18 18 pageRight 72 mul { % 1/4 inches + 0 moveto 0 15 rlineto stroke % Draw tic mark + } for + + 9 9 pageRight 72 mul { % 1/8 inches + 0 moveto 0 6 rlineto stroke % Draw tic mark + } for + grestore + + gsave % Right side centimeters + pageRight 72 mul 0 translate % Offset right edge + + 1 setlinewidth % Draw normal lines + CENTIMETER CENTIMETER + pageTop 72 mul { % Height centimeters + 0 exch moveto -24 0 rlineto stroke% Draw tic mark + } for + 1 1 pageTop 2.54 mul { % Height labels + dup + -24 exch CENTIMETER mul + pageHeight sub moveto % Draw number + cvi 10 string cvs show + } for + + 0.5 setlinewidth % Draw thin lines + 0 0.5 CENTIMETER mul + pageTop 72 mul { % 1/2 centimeters + 0 exch moveto -15 0 rlineto stroke% Draw tic mark + } for + 0 MILLIMETER pageTop 72 mul { % Millimeters + 0 exch moveto -6 0 rlineto stroke % Draw tic mark + } for + grestore + + gsave % Top centimeters + 0 pageTop 72 mul translate % Offset top edge + + 1 setlinewidth % Draw normal lines + CENTIMETER CENTIMETER + pageRight 72 mul { % Width centimeters + 0 moveto 0 -24 rlineto stroke % Draw tic mark + } for + 1 1 pageRight 2.54 mul { % Width labels + dup + CENTIMETER mul 3 add -24 moveto % Draw number + cvi 10 string cvs show + } for + + 0.5 setlinewidth % Draw thin lines + 0 0.5 CENTIMETER mul + pageRight 72 mul { % 1/2 centimeters + 0 moveto 0 -15 rlineto stroke % Draw tic mark + } for + 0 MILLIMETER pageRight 72 mul { % Millimeters + 0 moveto 0 -6 rlineto stroke % Draw tic mark + } for + grestore + + % Offset page to account for lower-left margin... + pageLeft 72 mul + pageBottom 72 mul + translate + + % Set text font and color... + mediumFont setfont % Font + 0 setgray % Color + 1 setlinewidth % Draw normal lines + + % Draw the color wheel... + gsave + % Position the wheel on the left side... + pageWidth 18 mul % x = pageWidth * 1/4 * 72 + pageHeight 54 mul % y = pageHeight * 3/4 * 72 + translate + + % Size the wheel... + wheelSize + + % Draw the colors... + dup (C) 3 -1 roll 0 1 1 SEXTANT 60 rotate + dup (M) 3 -1 roll 1 0 1 SEXTANT 60 rotate + dup (Y) 3 -1 roll 1 1 0 SEXTANT 60 rotate + dup (R) 3 -1 roll 1 0 0 SEXTANT 60 rotate + dup (G) 3 -1 roll 0 1 0 SEXTANT 60 rotate + dup (B) 3 -1 roll 0 0 1 SEXTANT 60 rotate + + pop + grestore + + % Label the color wheel... + pageWidth 18 mul % x = pageWidth * 1/4 * 72 + pageHeight 43 mul % y = pageHeight * 19/32 * 72 + moveto % Position the text + (Color Wheel) CENTER % Show the text centered + + % Draw the gray ramp... + gsave + % Position the gray ramp in the center... + pageWidth 36 mul % x = pageWidth * 1/2 * 72 + pageHeight 54 mul % y = pageHeight * 3/4 * 72 + wheelSize sub % - wheelSize + translate + + % Loop through 100 shades... + 0 0.010101 0.98 { + % Set the color... + dup setgray % Set the grayscale... + + % Draw the polygon... + newpath % Start a new path... + + wheelSize -0.2 mul % X = -wheelSize / 5 + 1 index 2 mul wheelSize mul % Y = val * 2 * wheelSize + moveto % Move there... + + wheelSize 0.4 mul 0 rlineto % Right side... + + wheelSize 0.2 mul % X = wheelSize / 5 + 1 index 0.010101 add 2 mul wheelSize mul + % Y = (val + 0.010101) * 2 * wheelSize + lineto % Move there... + + wheelSize -0.4 mul 0 rlineto % Left side... + + closepath % Close the path + fill % Fill it... + + pop % Pop value... + } for + + 0 setgray % Black + + newpath % Start a new path + wheelSize -0.2 mul 0 moveto % Bottom left + wheelSize 0.4 mul 0 rlineto % Bottom right + 0 wheelSize 2 mul rlineto % Upper right + wheelSize -0.4 mul 0 rlineto % Upper left + closepath % Close the path + stroke % Stroke it... + + 0 wheelSize -0.2 mul moveto % Center bottom for label + (K) CENTER % Center K at bottom + + 0 wheelSize 2.05 mul moveto % Center top for label + (W) CENTER % Center W at top + grestore + + % Label the gray ramp... + pageWidth 36 mul % x = pageWidth * 1/2 * 72 + pageHeight 43 mul % y = pageHeight * 19/32 * 72 + moveto % Position the text + (Gray Ramp) CENTER % Show the text centered + + + % Draw radial lines... + gsave + 0 setlinewidth % 1 pixel lines + + % Position the lines on the left side... + pageWidth 54 mul % x = pageWidth * 3/4 * 72 + pageHeight 54 mul % y = pageHeight * 3/4 * 72 + translate + + % Size the wheel... + wheelSize + + % Loop at 1 degree increments + 0 1 359 { + pop % Discard angle - not used + 0 0 moveto % Start line at the center + dup 0 lineto % Draw to the radius + 1 rotate % Rotate 1 degree + } for + + pop % Discard radius - not needed anymore + stroke % Draw lines... + + grestore + + % Label the lines... + pageWidth 54 mul % x = pageWidth * 3/4 * 72 + pageHeight 43 mul % y = pageHeight * 19/32 * 72 + moveto % Position the text + (1 Degree Radial Lines) CENTER % Show the text centered + + % Imageable area... + pageHeight 15 mul % Height of imageable area + + pageWidth 4.5 mul % x = pageWidth * 1/16 * 72 + pageHeight 35.5 mul % y = pageHeight * 1/2 * 72 + 2 index sub % y -= height + pageWidth 28 mul % width = pageWidth * 1/4 * 72 + 3 index % height + 0.5 setgray rectfill % Draw a shadow + + pageWidth 4 mul % x = pageWidth * 1/16 * 72 + pageHeight 36 mul % y = pageHeight * 1/2 * 72 + 2 index sub % y -= height + pageWidth 28 mul % width = pageWidth * 3/8 * 72 + 3 index % height + 4 copy 1 setgray rectfill % Clear the box to white + 0 setgray rectstroke % Draw a black box around it... + + pop % Discard height + + % Label the imageable area... + pageWidth 4 mul % x = pageWidth * 1/16 * 72 + pageHeight 37 mul % y = pageHeight * 1/2 * 72 + moveto % Position the text + mediumFont setfont % Font + (Imageable Area) show % Show the text + + smallFont setfont % Font + pageWidth 14 mul % x = pageWidth * 3/16 * 72 + pageHeight 36 mul % y = pageWidth * 1/2 * 72 + pageHeight -2 mul add % y -= 2 * smallFont height + + % Page Size inches + 2 copy moveto % Move to x & y + (Page Size: ) RIGHT % Label + 100 pageWidth NUMBER % pageWidth + (x) show % "x" + 100 pageHeight NUMBER % pageHeight + (in) show % "in" + + % Page Size millimeters + pageHeight sub % Move down... + + 2 copy moveto % Move to x & y + 10 pageWidth 25.4 mul NUMBER % pageWidth + (x) show % "x" + 10 pageHeight 25.4 mul NUMBER % pageHeight + (mm) show % "mm" + + % Lower-left inches + pageHeight 2 mul sub % Move down... + + 2 copy moveto % Move to x & y + (Lower-Left: ) RIGHT % Label + 100 pageLeft NUMBER % pageLeft + (x) show % "x" + 100 pageBottom NUMBER % pageBottom + (in) show % "in" + + % Lower-left millimeters + pageHeight sub % Move down... + + 2 copy moveto % Move to x & y + 10 pageLeft 25.4 mul NUMBER % pageLeft + (x) show % "x" + 10 pageBottom 25.4 mul NUMBER % pageBottom + (mm) show % "mm" + + % Upper-right inches + pageHeight 2 mul sub % Move down... + + 2 copy moveto % Move to x & y + (Upper-Right: ) RIGHT % Label + 100 pageRight NUMBER % pageRight + (x) show % "x" + 100 pageTop NUMBER % pageTop + (in) show % "in" + + % Upper-right millimeters + pageHeight sub % Move down... + + 2 copy moveto % Move to x & y + 10 pageRight 25.4 mul NUMBER % pageRight + (x) show % "x" + 10 pageTop 25.4 mul NUMBER % pageTop + (mm) show % "mm" + + % Resolution dots-per-inch + pageHeight 2 mul sub % Move down... + + 2 copy moveto % Move to x & y + (Resolution: ) RIGHT % Label + 1 xResolution NUMBER % xResolution + (x) show % "x" + 1 yResolution NUMBER % yResolution + (dpi) show % "dpi" + + % Resolution dots-per-meter + pageHeight sub % Move down... + + moveto % Move to x & y + 1 xResolution 39.27 mul NUMBER % xResolution + (x) show % "x" + 1 yResolution 39.27 mul NUMBER % yResolution + (dpm) show % "dpm" + + % Interpreter Information... + pageHeight 15 mul % Height of interpreter information + + pageWidth 40.5 mul % x = pageWidth * 9/16 * 72 + pageHeight 35.5 mul % y = pageHeight * 1/2 * 72 + 2 index sub % y -= height + pageWidth 28 mul % width = pageWidth * 1/4 * 72 + 3 index % height + 0.5 setgray rectfill % Draw a shadow + + pageWidth 40 mul % x = pageWidth * 9/16 * 72 + pageHeight 36 mul % y = pageHeight * 1/2 * 72 + 2 index sub % y -= height + pageWidth 28 mul % width = pageWidth * 3/8 * 72 + 3 index % height + 4 copy 1 setgray rectfill % Clear the box to white + 0 setgray rectstroke % Draw a black box around it... + + pop % Discard height + + % Label the interpreter info... + pageWidth 40 mul % x = pageWidth * 9/16 * 72 + pageHeight 37 mul % y = pageHeight * 1/2 * 72 + moveto % Position the text + mediumFont setfont % Font + (Interpreter Information) show % Show the text + + smallFont setfont % Font + pageWidth 49 mul % x = pageWidth * 11/16 * 72 + pageHeight 36 mul % y = pageWidth * 1/2 * 72 + pageHeight 2 mul sub % y -= 2 * smallFont height + + % Language level + 2 copy moveto % Move to x & y + (PostScript: ) RIGHT % Label + (Level ) show % "Level " + 1 languagelevel NUMBER % Language level + + % Version + pageHeight 2 mul sub % Move down... + 2 copy moveto % Move to x & y + (Version: ) RIGHT % Label + version show % Version + ( $) show % " (" + 1 revision NUMBER % Revision + ($) show % ")" + + % Product + pageHeight 2 mul sub % Move down... + 2 copy moveto % Move to x & y + (Product: ) RIGHT % Label + product show % Product name + + % Serial Number + pageHeight 2 mul sub % Move down... + moveto % Move to x & y + (Serial #: ) RIGHT % Label + 1 serialnumber NUMBER % S/N + + % Draw the label at the top... + pageWidth 36 mul % Center of page + pageHeight 66 mul % Top of page (11/12ths) + moveto % Position text + bigFont setfont % Font + (CUPS Printer Test Page 1/2) CENTER % Show text centered + + % Draw the copyright notice at the bottom... + pageWidth 17 mul % Center of page + pageHeight 9.5 mul % Bottom of page + moveto % Position text + (Printed with CUPS) show + + pageWidth 17 mul % Left side of page + pageHeight 7.5 mul % Move down... + 2 copy moveto % Position text + smallFont setfont % Font + (Copyright 2007-2010 Apple Inc., All Rights Reserved. CUPS and the CUPS logo are) show + pageHeight 2 add sub % Move down... + 2 copy moveto % Position text + (the trademark property of Apple Inc., 1 Infinite Loop, Cupertino, CA 95014, USA.) show + pageHeight 2 mul 4 add sub % Move down... + moveto % Position text + (Need help? Contact your operating system vendor or visit "http://www.cups.org/".) show + + % Then the CUPS logo.... + gsave + pageWidth 4 mul + pageHeight 4 mul + translate + pageWidth 15 mul CUPSLOGO + grestore + +% Show the page... +grestore +showpage + +% The second page: +%%Page: 2 2 +gsave + + % Determine the imageable area and device resolution... + initclip newpath clippath pathbbox % Get bounding rectangle + 72 div /pageTop exch def % Get top margin in inches + 72 div /pageRight exch def % Get right margin in inches + 72 div /pageBottom exch def % Get bottom margin in inches + 72 div /pageLeft exch def % Get left margin in inches + + 4 setlinewidth % Draw wide lines + 0 setgray closepath stroke % Draw a clipping rectangle + + /pageWidth pageRight pageLeft sub def % pageWidth = pageRight - pageLeft + /pageHeight pageTop pageBottom sub def% pageHeight = pageTop - pageBottom + + 72 72 dtransform % Get device resolution per inch + /yResolution exch abs def % yResolution = abs(yres) + /xResolution exch abs def % xResolution = abs(xres) + + % Figure out the sizes of things... + /wheelSize % size of wheels + pageWidth pageHeight lt + { pageWidth 9 mul } + { pageHeight 7 mul } + ifelse def + + % Create fonts... + /bigFont /Helvetica-Bold findfont % bigFont = Helvetica-Bold + pageHeight 3 mul scalefont def % size = pageHeight * 3 (nominally 33) + + /mediumFont /Helvetica findfont % mediumFont = Helvetica + pageHeight 1.5 mul scalefont def % size = pageHeight * 1.5 (nominally 16.5) + + /smallFont /Times-Roman findfont % smallFont = Times-Roman + pageHeight scalefont def % size = pageHeight (nominally 11) + + % Draw rulers along the edges... + /CENTIMETER 72 2.54 div def + /MILLIMETER 72 25.4 div def + + /Times-Roman findfont % Font for ruler numbers + 11 scalefont setfont % 11 points + + gsave % Left side inches + pageLeft 72 mul 0 translate % Offset left edge + + 1 setlinewidth % Draw normal lines + 72 72 pageTop 72 mul { % Height inches + dup dup + 0 exch moveto 24 0 rlineto stroke % Draw tic mark + 24 exch pageHeight sub moveto % Draw number + 72 div cvi 10 string cvs RIGHT + } for + + 0.5 setlinewidth % Draw thin lines + 18 18 pageTop 72 mul { % 1/4 inches + 0 exch moveto 15 0 rlineto stroke % Draw tic mark + } for + + 9 9 pageTop 72 mul { % 1/8 inches + 0 exch moveto 6 0 rlineto stroke % Draw tic mark + } for + grestore + + gsave % Bottom inches + 0 pageBottom 72 mul translate % Offset bottom edge + + 1 setlinewidth % Draw normal lines + 72 72 pageRight 72 mul { % Width inches + dup dup + 0 moveto 0 24 rlineto stroke % Draw tic mark + 3 add 27 pageHeight sub moveto % Draw number + 72 div cvi 10 string cvs show + } for + + 0.5 setlinewidth % Draw thin lines + 18 18 pageRight 72 mul { % 1/4 inches + 0 moveto 0 15 rlineto stroke % Draw tic mark + } for + + 9 9 pageRight 72 mul { % 1/8 inches + 0 moveto 0 6 rlineto stroke % Draw tic mark + } for + grestore + + gsave % Right side centimeters + pageRight 72 mul 0 translate % Offset right edge + + 1 setlinewidth % Draw normal lines + CENTIMETER CENTIMETER + pageTop 72 mul { % Height centimeters + 0 exch moveto -24 0 rlineto stroke% Draw tic mark + } for + 1 1 pageTop 2.54 mul { % Height labels + dup + -24 exch CENTIMETER mul + pageHeight sub moveto % Draw number + cvi 10 string cvs show + } for + + 0.5 setlinewidth % Draw thin lines + 0 0.5 CENTIMETER mul + pageTop 72 mul { % 1/2 centimeters + 0 exch moveto -15 0 rlineto stroke% Draw tic mark + } for + 0 MILLIMETER pageTop 72 mul { % Millimeters + 0 exch moveto -6 0 rlineto stroke % Draw tic mark + } for + grestore + + gsave % Top centimeters + 0 pageTop 72 mul translate % Offset top edge + + 1 setlinewidth % Draw normal lines + CENTIMETER CENTIMETER + pageRight 72 mul { % Width centimeters + 0 moveto 0 -24 rlineto stroke % Draw tic mark + } for + 1 1 pageRight 2.54 mul { % Width labels + dup + CENTIMETER mul 3 add -24 moveto % Draw number + cvi 10 string cvs show + } for + + 0.5 setlinewidth % Draw thin lines + 0 0.5 CENTIMETER mul + pageRight 72 mul { % 1/2 centimeters + 0 moveto 0 -15 rlineto stroke % Draw tic mark + } for + 0 MILLIMETER pageRight 72 mul { % Millimeters + 0 moveto 0 -6 rlineto stroke % Draw tic mark + } for + grestore + + % Offset page to account for lower-left margin... + pageLeft 72 mul + pageBottom 72 mul + translate + + % Set text font and color... + mediumFont setfont % Font + 0 setgray % Color + 1 setlinewidth % Draw normal lines + + % Draw the color wheel... + gsave + % Position the wheel on the left side... + pageWidth 18 mul % x = pageWidth * 1/4 * 72 + pageHeight 54 mul % y = pageHeight * 3/4 * 72 + translate + + % Size the wheel... + wheelSize + + % Draw the colors... + dup (C) 3 -1 roll 0 1 1 SEXTANT 60 rotate + dup (M) 3 -1 roll 1 0 1 SEXTANT 60 rotate + dup (Y) 3 -1 roll 1 1 0 SEXTANT 60 rotate + dup (R) 3 -1 roll 1 0 0 SEXTANT 60 rotate + dup (G) 3 -1 roll 0 1 0 SEXTANT 60 rotate + dup (B) 3 -1 roll 0 0 1 SEXTANT 60 rotate + + pop + grestore + + % Label the color wheel... + pageWidth 18 mul % x = pageWidth * 1/4 * 72 + pageHeight 43 mul % y = pageHeight * 19/32 * 72 + moveto % Position the text + (Color Wheel) CENTER % Show the text centered + + % Draw the gray ramp... + gsave + % Position the gray ramp in the center... + pageWidth 36 mul % x = pageWidth * 1/2 * 72 + pageHeight 54 mul % y = pageHeight * 3/4 * 72 + wheelSize sub % - wheelSize + translate + + % Loop through 100 shades... + 0 0.010101 0.98 { + % Set the color... + dup setgray % Set the grayscale... + + % Draw the polygon... + newpath % Start a new path... + + wheelSize -0.2 mul % X = -wheelSize / 5 + 1 index 2 mul wheelSize mul % Y = val * 2 * wheelSize + moveto % Move there... + + wheelSize 0.4 mul 0 rlineto % Right side... + + wheelSize 0.2 mul % X = wheelSize / 5 + 1 index 0.010101 add 2 mul wheelSize mul + % Y = (val + 0.010101) * 2 * wheelSize + lineto % Move there... + + wheelSize -0.4 mul 0 rlineto % Left side... + + closepath % Close the path + fill % Fill it... + + pop % Pop value... + } for + + 0 setgray % Black + + newpath % Start a new path + wheelSize -0.2 mul 0 moveto % Bottom left + wheelSize 0.4 mul 0 rlineto % Bottom right + 0 wheelSize 2 mul rlineto % Upper right + wheelSize -0.4 mul 0 rlineto % Upper left + closepath % Close the path + stroke % Stroke it... + + 0 wheelSize -0.2 mul moveto % Center bottom for label + (K) CENTER % Center K at bottom + + 0 wheelSize 2.05 mul moveto % Center top for label + (W) CENTER % Center W at top + grestore + + % Label the gray ramp... + pageWidth 36 mul % x = pageWidth * 1/2 * 72 + pageHeight 43 mul % y = pageHeight * 19/32 * 72 + moveto % Position the text + (Gray Ramp) CENTER % Show the text centered + + + % Draw radial lines... + gsave + 0 setlinewidth % 1 pixel lines + + % Position the lines on the left side... + pageWidth 54 mul % x = pageWidth * 3/4 * 72 + pageHeight 54 mul % y = pageHeight * 3/4 * 72 + translate + + % Size the wheel... + wheelSize + + % Loop at 1 degree increments + 0 1 359 { + pop % Discard angle - not used + 0 0 moveto % Start line at the center + dup 0 lineto % Draw to the radius + 1 rotate % Rotate 1 degree + } for + + pop % Discard radius - not needed anymore + stroke % Draw lines... + + grestore + + % Label the lines... + pageWidth 54 mul % x = pageWidth * 3/4 * 72 + pageHeight 43 mul % y = pageHeight * 19/32 * 72 + moveto % Position the text + (1 Degree Radial Lines) CENTER % Show the text centered + + % Imageable area... + pageHeight 15 mul % Height of imageable area + + pageWidth 4.5 mul % x = pageWidth * 1/16 * 72 + pageHeight 35.5 mul % y = pageHeight * 1/2 * 72 + 2 index sub % y -= height + pageWidth 28 mul % width = pageWidth * 1/4 * 72 + 3 index % height + 0.5 setgray rectfill % Draw a shadow + + pageWidth 4 mul % x = pageWidth * 1/16 * 72 + pageHeight 36 mul % y = pageHeight * 1/2 * 72 + 2 index sub % y -= height + pageWidth 28 mul % width = pageWidth * 3/8 * 72 + 3 index % height + 4 copy 1 setgray rectfill % Clear the box to white + 0 setgray rectstroke % Draw a black box around it... + + pop % Discard height + + % Label the imageable area... + pageWidth 4 mul % x = pageWidth * 1/16 * 72 + pageHeight 37 mul % y = pageHeight * 1/2 * 72 + moveto % Position the text + mediumFont setfont % Font + (Imageable Area) show % Show the text + + smallFont setfont % Font + pageWidth 14 mul % x = pageWidth * 3/16 * 72 + pageHeight 36 mul % y = pageWidth * 1/2 * 72 + pageHeight -2 mul add % y -= 2 * smallFont height + + % Page Size inches + 2 copy moveto % Move to x & y + (Page Size: ) RIGHT % Label + 100 pageWidth NUMBER % pageWidth + (x) show % "x" + 100 pageHeight NUMBER % pageHeight + (in) show % "in" + + % Page Size millimeters + pageHeight sub % Move down... + + 2 copy moveto % Move to x & y + 10 pageWidth 25.4 mul NUMBER % pageWidth + (x) show % "x" + 10 pageHeight 25.4 mul NUMBER % pageHeight + (mm) show % "mm" + + % Lower-left inches + pageHeight 2 mul sub % Move down... + + 2 copy moveto % Move to x & y + (Lower-Left: ) RIGHT % Label + 100 pageLeft NUMBER % pageLeft + (x) show % "x" + 100 pageBottom NUMBER % pageBottom + (in) show % "in" + + % Lower-left millimeters + pageHeight sub % Move down... + + 2 copy moveto % Move to x & y + 10 pageLeft 25.4 mul NUMBER % pageLeft + (x) show % "x" + 10 pageBottom 25.4 mul NUMBER % pageBottom + (mm) show % "mm" + + % Upper-right inches + pageHeight 2 mul sub % Move down... + + 2 copy moveto % Move to x & y + (Upper-Right: ) RIGHT % Label + 100 pageRight NUMBER % pageRight + (x) show % "x" + 100 pageTop NUMBER % pageTop + (in) show % "in" + + % Upper-right millimeters + pageHeight sub % Move down... + + 2 copy moveto % Move to x & y + 10 pageRight 25.4 mul NUMBER % pageRight + (x) show % "x" + 10 pageTop 25.4 mul NUMBER % pageTop + (mm) show % "mm" + + % Resolution dots-per-inch + pageHeight 2 mul sub % Move down... + + 2 copy moveto % Move to x & y + (Resolution: ) RIGHT % Label + 1 xResolution NUMBER % xResolution + (x) show % "x" + 1 yResolution NUMBER % yResolution + (dpi) show % "dpi" + + % Resolution dots-per-meter + pageHeight sub % Move down... + + moveto % Move to x & y + 1 xResolution 39.27 mul NUMBER % xResolution + (x) show % "x" + 1 yResolution 39.27 mul NUMBER % yResolution + (dpm) show % "dpm" + + % Interpreter Information... + pageHeight 15 mul % Height of interpreter information + + pageWidth 40.5 mul % x = pageWidth * 9/16 * 72 + pageHeight 35.5 mul % y = pageHeight * 1/2 * 72 + 2 index sub % y -= height + pageWidth 28 mul % width = pageWidth * 1/4 * 72 + 3 index % height + 0.5 setgray rectfill % Draw a shadow + + pageWidth 40 mul % x = pageWidth * 9/16 * 72 + pageHeight 36 mul % y = pageHeight * 1/2 * 72 + 2 index sub % y -= height + pageWidth 28 mul % width = pageWidth * 3/8 * 72 + 3 index % height + 4 copy 1 setgray rectfill % Clear the box to white + 0 setgray rectstroke % Draw a black box around it... + + pop % Discard height + + % Label the interpreter info... + pageWidth 40 mul % x = pageWidth * 9/16 * 72 + pageHeight 37 mul % y = pageHeight * 1/2 * 72 + moveto % Position the text + mediumFont setfont % Font + (Interpreter Information) show % Show the text + + smallFont setfont % Font + pageWidth 49 mul % x = pageWidth * 11/16 * 72 + pageHeight 36 mul % y = pageWidth * 1/2 * 72 + pageHeight 2 mul sub % y -= 2 * smallFont height + + % Language level + 2 copy moveto % Move to x & y + (PostScript: ) RIGHT % Label + (Level ) show % "Level " + 1 languagelevel NUMBER % Language level + + % Version + pageHeight 2 mul sub % Move down... + 2 copy moveto % Move to x & y + (Version: ) RIGHT % Label + version show % Version + ( $) show % " (" + 1 revision NUMBER % Revision + ($) show % ")" + + % Product + pageHeight 2 mul sub % Move down... + 2 copy moveto % Move to x & y + (Product: ) RIGHT % Label + product show % Product name + + % Serial Number + pageHeight 2 mul sub % Move down... + moveto % Move to x & y + (Serial #: ) RIGHT % Label + 1 serialnumber NUMBER % S/N + + % Draw the label at the top... + pageWidth 36 mul % Center of page + pageHeight 66 mul % Top of page (11/12ths) + moveto % Position text + bigFont setfont % Font + (CUPS Printer Test Page 2/2) CENTER % Show text centered + + % Draw the copyright notice at the bottom... + pageWidth 17 mul % Center of page + pageHeight 9.5 mul % Bottom of page + moveto % Position text + (Printed with CUPS) show + + pageWidth 17 mul % Left side of page + pageHeight 7.5 mul % Move down... + 2 copy moveto % Position text + smallFont setfont % Font + (Copyright 2007-2010 Apple Inc., All Rights Reserved. CUPS and the CUPS logo are) show + pageHeight 2 add sub % Move down... + 2 copy moveto % Position text + (the trademark property of Apple Inc., 1 Infinite Loop, Cupertino, CA 95014, USA.) show + pageHeight 2 mul 4 add sub % Move down... + moveto % Position text + (Need help? Contact your operating system vendor or visit "http://www.cups.org/".) show + + % Then the CUPS logo.... + gsave + pageWidth 4 mul + pageHeight 4 mul + translate + pageWidth 15 mul CUPSLOGO + grestore + +% Show the page... +grestore +showpage +% +% End of "$Id: testprint.ps 8236 2009-01-13 17:27:16Z mike $". +% +%%EOF Modified: trunk/printer/package/yast2-printer.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/package/yast2-printer.ch… ============================================================================== --- trunk/printer/package/yast2-printer.changes (original) +++ trunk/printer/package/yast2-printer.changes Tue Aug 10 16:16:58 2010 @@ -1,4 +1,18 @@ ------------------------------------------------------------------- +Tue Aug 10 15:56:38 CEST 2010 - jsmeix(a)suse.de + +- Added testprint.2pages.ps and enhanced test page printing + in overview.ycp to let the user choose to print one (default) + or two pages test print e.g. to test duplex printing + (see Novell/Suse Bugzilla bnc#629160). +- Enhanced texts in popups regarding firewall so that they + can no longer be misunderstood to open ports + (see Novell/Suse Bugzilla bnc#627799). +- Enhanced the help text regarding possible drawback (delays + if CUPS server does not respond) for a "client only" config. +- 2.20.0 + +------------------------------------------------------------------- Thu Jul 1 17:33:47 CEST 2010 - jsmeix(a)suse.de - Enhanced the test_* tools to do the most meaningful test first Modified: trunk/printer/src/overview.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/overview.ycp?rev=623… ============================================================================== --- trunk/printer/src/overview.ycp (original) +++ trunk/printer/src/overview.ycp Tue Aug 10 16:16:58 2010 @@ -666,8 +666,6 @@ } } string testprint_job_title = "YaST2testprint_" + queue_name; - // Do not enforce to talk to the cupsd on localhost when submiting the testpage - // because testpage printing must also work for a "client-only" config. // Since CUPS 1.4 there is no longer a readymade PostScript testpage in CUPS, see // https://bugzilla.novell.com/show_bug.cgi?id=520617 // Therefore a slightly modified CUPS 1.3.10 testprint.ps was added @@ -683,13 +681,32 @@ // + (Printed with CUPS) show // make it obvious that it is not a YaST testpage but a CUPS testpage // and it is now independent of the CUPS version. + string testprint_file_name = "/usr/share/YaST2/data/testprint.ps"; + if( ! Popup::AnyQuestion( // Popup::AnyQuestion header: + _("Test printout"), + // Popup::AnyQuestion message: + _("Print one or two pages e.g. to test duplex printing"), + // Popup::AnyQuestion so called 'yes' (default) button label: + _("Single test page"), + // Popup::AnyQuestion so called 'no' button label: + _("Two test pages"), + // The so called 'yes' button is the default choice: + `focus_yes + ) + ) + { // Basically testprint.2pages.ps consists of two testprint.ps concatenated: + testprint_file_name = "/usr/share/YaST2/data/testprint.2pages.ps"; + } + // Do not enforce to talk to the cupsd on localhost when submiting the testpage + // because testpage printing must also work for a "client-only" config. if( ! Printerlib::ExecuteBashCommand( "/usr/bin/lp -d '" + queue_name + "' -t '" + testprint_job_title + "' -o page-label=\"" + queue_name - + ":YaST2testprint@$(hostname)\" /usr/share/YaST2/data/testprint.ps" + + ":YaST2testprint@$(hostname)\" " + + testprint_file_name ) ) { Popup::ErrorDetails( sformat( // Message of a Popup::ErrorDetails -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62376 - in /trunk/autoinstallation: package/autoyast2.changes src/include/xml.ycp
by ug＠svn.opensuse.org 10 Aug '10

10 Aug '10

Author: ug Date: Tue Aug 10 15:13:26 2010 New Revision: 62376 URL: http://svn.opensuse.org/viewcvs/yast?rev=62376&view=rev Log: media_url removed from CDATA Modified: trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/include/xml.ycp Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyas… ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Tue Aug 10 15:13:26 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Aug 10 15:12:56 CEST 2010 - ug(a)suse.de + +- media_url removed from CDATA + +------------------------------------------------------------------- Thu Aug 5 10:53:55 CEST 2010 - ug(a)suse.de - a new filesystem can be specified for partitioning_advanced Modified: trunk/autoinstallation/src/include/xml.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/include/xml… ============================================================================== --- trunk/autoinstallation/src/include/xml.ycp (original) +++ trunk/autoinstallation/src/include/xml.ycp Tue Aug 10 15:13:26 2010 @@ -99,7 +99,7 @@ "net-udev":"rule" ]; - doc["cdataSections"] = ["source", "info_file", "file_contents", "pxelinux-config", "media_url", "location", "script_source"]; + doc["cdataSections"] = ["source", "info_file", "file_contents", "pxelinux-config", "location", "script_source"]; // doc["systemID"] = "/usr/share/autoinstall/dtd/profile.dtd"; doc["rootElement"] = "profile"; doc["nameSpace"] = "http://www.suse.com/1.0/yast2ns"; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62375 - in /trunk/core: VERSION libycp/src/parser.yy package/yast2-core.changes
by mvidner＠svn.opensuse.org 10 Aug '10

10 Aug '10

Author: mvidner Date: Tue Aug 10 13:29:07 2010 New Revision: 62375 URL: http://svn.opensuse.org/viewcvs/yast?rev=62375&view=rev Log: Enable input buffering for YCP include files (bnc#629882). Modified: trunk/core/VERSION trunk/core/libycp/src/parser.yy trunk/core/package/yast2-core.changes Modified: trunk/core/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/VERSION?rev=62375&r1=62374&… ============================================================================== --- trunk/core/VERSION (original) +++ trunk/core/VERSION Tue Aug 10 13:29:07 2010 @@ -1 +1 @@ -2.19.2 +2.19.3 Modified: trunk/core/libycp/src/parser.yy URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/src/parser.yy?rev=62… ============================================================================== --- trunk/core/libycp/src/parser.yy (original) +++ trunk/core/libycp/src/parser.yy Tue Aug 10 13:29:07 2010 @@ -1502,6 +1502,7 @@ // we duplicate the value, so scanner gets its own instance p_parser->setScanner (new Scanner (fd, Scanner::doStrdup($2.v.sval))); + p_parser->setBuffered(); // was missing, bnc#629882 // pass the outer scanner's tables p_parser->scanner()->initTables (scanner->scanner->globalTable(), scanner->scanner->localTable()); Modified: trunk/core/package/yast2-core.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/package/yast2-core.changes?… ============================================================================== --- trunk/core/package/yast2-core.changes (original) +++ trunk/core/package/yast2-core.changes Tue Aug 10 13:29:07 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Aug 10 13:28:57 CEST 2010 - mvidner(a)suse.cz + +- Enable input buffering for YCP include files (bnc#629882). +- 2.19.3 + +------------------------------------------------------------------- Thu Mar 11 15:36:27 CET 2010 - mvidner(a)suse.cz - Fixed the regexpsub algorithm not to loop endlessly -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62374 - /trunk/storage/storage/src/modules/FileSystems.ycp
by fehr＠svn.opensuse.org 09 Aug '10

09 Aug '10

Author: fehr Date: Mon Aug 9 17:29:43 2010 New Revision: 62374 URL: http://svn.opensuse.org/viewcvs/yast?rev=62374&view=rev Log: fix typos Modified: trunk/storage/storage/src/modules/FileSystems.ycp Modified: trunk/storage/storage/src/modules/FileSystems.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/File… ============================================================================== --- trunk/storage/storage/src/modules/FileSystems.ycp (original) +++ trunk/storage/storage/src/modules/FileSystems.ycp Mon Aug 9 17:29:43 2010 @@ -603,8 +603,8 @@ `default : false, // help text, richtext format `help_text : _("No Journal: -Supressed use of journaling on filesystem. Only activate this when you really -know what you ar doing.\n") +Suppressed use of journaling on filesystem. Only activate this when you really +know what you are doing.\n") ] ]; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62373 - in /trunk/storage: package/yast2-storage.changes storage/src/modules/FileSystems.ycp
by fehr＠svn.opensuse.org 09 Aug '10

09 Aug '10

Author: fehr Date: Mon Aug 9 13:51:30 2010 New Revision: 62373 URL: http://svn.opensuse.org/viewcvs/yast?rev=62373&view=rev Log: add option to supress journal to mkfs options for ext3 and ext4 (bnc#629363) Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/modules/FileSystems.ycp Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Mon Aug 9 13:51:30 2010 @@ -2,6 +2,8 @@ Mon Aug 9 13:38:45 CEST 2010 - fehr(a)suse.de - make mkfs option "dir_index" work as expected again +- add option to supress journal to mkfs options for ext3 and ext4 + (bnc#629363) ------------------------------------------------------------------- Fri Aug 06 15:48:27 CEST 2010 - aschnell(a)suse.de Modified: trunk/storage/storage/src/modules/FileSystems.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/File… ============================================================================== --- trunk/storage/storage/src/modules/FileSystems.ycp (original) +++ trunk/storage/storage/src/modules/FileSystems.ycp Mon Aug 9 13:51:30 2010 @@ -593,6 +593,18 @@ // help text, richtext format `help_text : _("Directory Index: Enables use of hashed b-trees to speed up lookups in large directories.\n") + ], + $[ + // label text + `widget : `CheckBox(`id("no_journal"), `opt(`hstretch), _("&No Journal")), + `query_key : "no_journal", + `option_str : "-O ^has_journal", + `type : `boolean, + `default : false, + // help text, richtext format + `help_text : _("No Journal: +Supressed use of journaling on filesystem. Only activate this when you really +know what you ar doing.\n") ] ]; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62372 - in /trunk/storage: package/yast2-storage.changes storage/src/include/custom_part_dialogs.ycp storage/src/modules/FileSystems.ycp storage/src/modules/Storage.ycp
by fehr＠svn.opensuse.org 09 Aug '10

09 Aug '10

Author: fehr Date: Mon Aug 9 13:49:48 2010 New Revision: 62372 URL: http://svn.opensuse.org/viewcvs/yast?rev=62372&view=rev Log: make mkfs option "dir_index" work as expected again Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/custom_part_dialogs.ycp trunk/storage/storage/src/modules/FileSystems.ycp trunk/storage/storage/src/modules/Storage.ycp Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Mon Aug 9 13:49:48 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Aug 9 13:38:45 CEST 2010 - fehr(a)suse.de + +- make mkfs option "dir_index" work as expected again + +------------------------------------------------------------------- Fri Aug 06 15:48:27 CEST 2010 - aschnell(a)suse.de - hide button "Create New Partition Table" for DASDs Modified: trunk/storage/storage/src/include/custom_part_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/cust… ============================================================================== --- trunk/storage/storage/src/include/custom_part_dialogs.ycp (original) +++ trunk/storage/storage/src/include/custom_part_dialogs.ycp Mon Aug 9 13:49:48 2010 @@ -370,6 +370,11 @@ $[ "option_str" : entry[`option_str]:"", "option_cmd" : entry[`option_cmd]:`mkfs, "option_value" : query ]; + if( is( query, boolean ) && query==false && + haskey( entry, `option_false ) ) + { + fs_option["option_str"] = entry[`option_false]:""; + } y2milestone( "FileSystemOptions fs_option %1", fs_option ); if( entry[`option_blank]:false ) Modified: trunk/storage/storage/src/modules/FileSystems.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/File… ============================================================================== --- trunk/storage/storage/src/modules/FileSystems.ycp (original) +++ trunk/storage/storage/src/modules/FileSystems.ycp Mon Aug 9 13:49:48 2010 @@ -588,8 +588,8 @@ `widget : `CheckBox(`id("opt_dir_index"), `opt(`hstretch), _("&Directory Index Feature")), `query_key : "opt_dir_index", `option_str : "-O dir_index", + `option_false : "-O ^dir_index", `type : `boolean, - `default : false, // help text, richtext format `help_text : _("Directory Index: Enables use of hashed b-trees to speed up lookups in large directories.\n") Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Mon Aug 9 13:49:48 2010 @@ -1071,7 +1071,7 @@ } else if( is(option_value, boolean) && option_value != nil ) { - if( (boolean) option_value ) + if( size(option_str)>0 ) { if( size(ret)>0 ) ret = ret + " "; @@ -1113,17 +1113,30 @@ ``{ map m = $[]; string os = o[`option_str]:""; - if( !found && size(os)>0 && search( opts, os )==0 ) + string nos = o[`option_false]:""; + boolean se_ok = false; + boolean found_os = false; + if( size(os)>0 && search( opts, os )==0 ) + { + found_os = true; + se_ok = true; + } + else if( size(nos)>0 && search( opts, nos )==0) + { + found_os = false; + se_ok = true; + } + if( !found && se_ok ) { found = true; - m["option_str"] = os; + m["option_str"] = found_os?os:nos; m["option_cmd"] = o[`option_cmd]:`mkfs; if( o[`type]:`text==`boolean ) { - m["option_value"] = true; + m["option_value"] = found_os; ret[o[`query_key]:""] = m; } - opts = substring( opts, size(os) ); + opts = substring( opts, found_os?size(os):size(nos) ); pos = findfirstnotof( opts, " \t" ); if( pos>0 ) opts = substring( opts, pos ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62371 - /tags/stable-2_20_0/add-on-creator/
by jsuchome＠svn.opensuse.org 09 Aug '10

09 Aug '10

Author: jsuchome Date: Mon Aug 9 10:32:34 2010 New Revision: 62371 URL: http://svn.opensuse.org/viewcvs/yast?rev=62371&view=rev Log: Created tag stable-2_20_0 for add-on-creator Added: tags/stable-2_20_0/add-on-creator/ - copied from r62370, trunk/add-on-creator/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62370 - in /trunk/add-on-creator: VERSION package/yast2-add-on-creator.changes src/AddOnCreator.ycp
by jsuchome＠svn.opensuse.org 09 Aug '10

09 Aug '10

Author: jsuchome Date: Mon Aug 9 10:32:28 2010 New Revision: 62370 URL: http://svn.opensuse.org/viewcvs/yast?rev=62370&view=rev Log: - correct file name of exported keys (bnc#622569) - 2.20.0 Modified: trunk/add-on-creator/VERSION trunk/add-on-creator/package/yast2-add-on-creator.changes trunk/add-on-creator/src/AddOnCreator.ycp Modified: trunk/add-on-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/VERSION?rev=62370… ============================================================================== --- trunk/add-on-creator/VERSION (original) +++ trunk/add-on-creator/VERSION Mon Aug 9 10:32:28 2010 @@ -1 +1 @@ -2.19.2 +2.20.0 Modified: trunk/add-on-creator/package/yast2-add-on-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/package/yast2-add… ============================================================================== --- trunk/add-on-creator/package/yast2-add-on-creator.changes (original) +++ trunk/add-on-creator/package/yast2-add-on-creator.changes Mon Aug 9 10:32:28 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Aug 9 10:31:21 CEST 2010 - jsuchome(a)suse.cz + +- correct file name of exported keys (bnc#622569) +- 2.20.0 + +------------------------------------------------------------------- Tue Jul 27 13:48:15 CEST 2010 - jsuchome(a)suse.cz - cleanup the preparation directory for building iso image Modified: trunk/add-on-creator/src/AddOnCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/src/AddOnCreator.… ============================================================================== --- trunk/add-on-creator/src/AddOnCreator.ycp (original) +++ trunk/add-on-creator/src/AddOnCreator.ycp Mon Aug 9 10:32:28 2010 @@ -2678,16 +2678,21 @@ map out = (map)SCR::Execute (.target.bash_output, command, $["LANG" : "C"]); string local_key = deletechars (out["stdout"]:"0","\n"); - out = (map)SCR::Execute (.target.bash_output, sformat ("gpg --list-secret-keys --with-colons %1| grep %2 | gawk -F: '{print $5}'| sed 's/........$//g'", key, local_key)); - string big_key = deletechars (out["stdout"]:"0","\n"); + // see /usr/share/doc/packages/gpg2/DETAILS for gpg --list-secret-keys --with-colons + // file name of exported key: keyid-creation date of the selfsignature (ie. e85fc3fc-4c1b74be) + + out = (map)SCR::Execute (.target.bash_output, sformat ("gpg --list-secret-keys --with-colons %1| grep %2 | gawk -F: '{print $6}'", key, local_key)); + + integer creation_date = tointeger (deletechars (out["stdout"]:"0","\n")); + string creation_date_s = substring (tohexstring (creation_date), 2); // use hex string without leading 0x // save the passphrase string pw_path = tmpdir + "/pw"; SCR::Write (.target.string, pw_path, passphrase); // export the key: - command = sformat ("gpg --export -a %1 > '%2/gpg-pubkey-%3-%1.asc'", - local_key, base_path, big_key); + command = sformat ("gpg --export -a %1 > '%2/gpg-pubkey-%1-%3.asc'", + tolower (local_key), base_path, creation_date_s); SCR::Execute (.target.bash, command, $["LANG" : "C"]); // make a sha1 sum of that key (content file is modified last time) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62369 - in /trunk/storage: package/yast2-storage.changes storage/src/include/ep-hd.ycp
by aschnell＠svn.opensuse.org 06 Aug '10

06 Aug '10

Author: aschnell Date: Fri Aug 6 15:49:37 2010 New Revision: 62369 URL: http://svn.opensuse.org/viewcvs/yast?rev=62369&view=rev Log: - hide button "Create New Partition Table" for DASDs Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/ep-hd.ycp Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Fri Aug 6 15:49:37 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Aug 06 15:48:27 CEST 2010 - aschnell(a)suse.de + +- hide button "Create New Partition Table" for DASDs + +------------------------------------------------------------------- Tue Aug 03 12:45:44 CEST 2010 - aschnell(a)suse.de - increased proposed size for /boot to 150 MB (bnc #627288) Modified: trunk/storage/storage/src/include/ep-hd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-h… ============================================================================== --- trunk/storage/storage/src/include/ep-hd.ycp (original) +++ trunk/storage/storage/src/include/ep-hd.ycp Fri Aug 6 15:49:37 2010 @@ -295,16 +295,22 @@ term table_header = StorageFields::TableHeader(fields); list<term> table_contents = StorageFields::TableContents(fields, target_map, Predicate); - list<term> expert_cmds = [ - `item(`id(`create_partition_table), - // menu entry text - _("Create New Partition Table")), - `item(`id(`clone_disk), - // menu entry text - _("Clone This Disk")) - ]; + list<term> expert_cmds = []; - if (Arch::s390() && search(device, "/dev/dasd") == 0) + if (!String::StartsWith(device, "/dev/dasd")) + { + expert_cmds = add(expert_cmds, + `item(`id(`create_partition_table), + // menu entry text + _("Create New Partition Table"))); + } + + expert_cmds = add(expert_cmds, + `item(`id(`clone_disk), + // menu entry text + _("Clone This Disk"))); + + if (String::StartsWith(device, "/dev/dasd")) { expert_cmds = add(expert_cmds, `item(`id(`dasdfmt), -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62368 - /tags/branch-Code-11-SP1-2_17_141/network/
by mzugec＠svn.opensuse.org 06 Aug '10

06 Aug '10

Author: mzugec Date: Fri Aug 6 14:22:00 2010 New Revision: 62368 URL: http://svn.opensuse.org/viewcvs/yast?rev=62368&view=rev Log: Created tag branch-Code-11-SP1-2_17_141 for network Added: tags/branch-Code-11-SP1-2_17_141/network/ (props changed) - copied from r62367, branches/SuSE-Code-11-SP1-Branch/network/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62367 - /tags/branch-Code-11-SP1-2_17_141/
by mzugec＠svn.opensuse.org 06 Aug '10

06 Aug '10

Author: mzugec Date: Fri Aug 6 14:21:58 2010 New Revision: 62367 URL: http://svn.opensuse.org/viewcvs/yast?rev=62367&view=rev Log: Created tag branch-Code-11-SP1-2_17_141 Added: tags/branch-Code-11-SP1-2_17_141/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62366 - in /branches/SuSE-Code-11-SP1-Branch/network: VERSION package/yast2-network.changes src/modules/Proxy.ycp
by mzugec＠svn.opensuse.org 06 Aug '10

06 Aug '10

Author: mzugec Date: Fri Aug 6 14:21:52 2010 New Revision: 62366 URL: http://svn.opensuse.org/viewcvs/yast?rev=62366&view=rev Log: Proxy: correctly enclose user:password into quotes (bnc#616695) Modified: branches/SuSE-Code-11-SP1-Branch/network/VERSION branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes branches/SuSE-Code-11-SP1-Branch/network/src/modules/Proxy.ycp Modified: branches/SuSE-Code-11-SP1-Branch/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/network/VERSION Fri Aug 6 14:21:52 2010 @@ -1 +1 @@ -2.17.140 +2.17.141 Modified: branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes Fri Aug 6 14:21:52 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Aug 6 14:20:40 CEST 2010 - mzugec(a)suse.de + +- Proxy: correctly enclose user:password into quotes (bnc#616695) +- 2.17.141 + +------------------------------------------------------------------- Mon Aug 2 14:01:45 CEST 2010 - mzugec(a)suse.de - YaPI: static hostname with DHCP (bnc#624655) Modified: branches/SuSE-Code-11-SP1-Branch/network/src/modules/Proxy.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/src/modules/Proxy.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/network/src/modules/Proxy.ycp Fri Aug 6 14:21:52 2010 @@ -257,10 +257,10 @@ proxy_password = mergestring (splitstring(proxy_password, "\""), "\\\""); string user_pass = (proxy_user != "" ? - " --proxy-user " + proxy_user + (proxy_password != "" ? + " --proxy-user '" + proxy_user + (proxy_password != "" ? ":" + proxy_password : - "") + "") + "'" : ""); @@ -268,7 +268,7 @@ integer timeout_sec = 90; // %1 = http or ftp proxy, %2 = user:password if any, %3 = URL // enclose user:password into quotes, it may contain special characters (#338264) - string command = "curl --verbose --proxy %1 '%2' --connect-timeout %3 --url %4"; + string command = "curl --verbose --proxy %1 %2 --connect-timeout %3 --url %4"; string http_command = sformat(command, http_proxy, user_pass, timeout_sec, "http://www.novell.com"); // adding option --insecure to accept the certificate without asking string https_command = sformat(command, https_proxy, user_pass, timeout_sec, "https://secure-www.novell.com --insecure"); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62365 - /tags/stable-2_19_36/network/
by mzugec＠svn.opensuse.org 06 Aug '10

06 Aug '10

Author: mzugec Date: Fri Aug 6 13:55:01 2010 New Revision: 62365 URL: http://svn.opensuse.org/viewcvs/yast?rev=62365&view=rev Log: Created tag stable-2_19_36 for network Added: tags/stable-2_19_36/network/ - copied from r62364, trunk/network/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62364 - /tags/stable-2_19_36/
by mzugec＠svn.opensuse.org 06 Aug '10

06 Aug '10

Author: mzugec Date: Fri Aug 6 13:54:59 2010 New Revision: 62364 URL: http://svn.opensuse.org/viewcvs/yast?rev=62364&view=rev Log: Created tag stable-2_19_36 Added: tags/stable-2_19_36/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62363 - in /trunk/network: VERSION package/yast2-network.changes src/modules/Proxy.ycp
by mzugec＠svn.opensuse.org 06 Aug '10

06 Aug '10

Author: mzugec Date: Fri Aug 6 13:54:52 2010 New Revision: 62363 URL: http://svn.opensuse.org/viewcvs/yast?rev=62363&view=rev Log: Proxy: correctly enclose user:password into quotes (bnc#616695) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/modules/Proxy.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=62363&r1=623… ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Fri Aug 6 13:54:52 2010 @@ -1 +1 @@ -2.19.35 +2.19.36 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Fri Aug 6 13:54:52 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Aug 6 13:47:17 CEST 2010 - mzugec(a)suse.cz + +- Proxy: correctly enclose user:password into quotes (bnc#616695) +- 2.19.36 + +------------------------------------------------------------------- Fri Jul 30 13:37:32 CEST 2010 - mzugec(a)suse.cz - ISDN: removed deprecated documentation URL (bnc#590742) Modified: trunk/network/src/modules/Proxy.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Proxy.ycp?re… ============================================================================== --- trunk/network/src/modules/Proxy.ycp (original) +++ trunk/network/src/modules/Proxy.ycp Fri Aug 6 13:54:52 2010 @@ -253,19 +253,19 @@ proxy_user = mergestring (splitstring(proxy_user, "\\"), "\\\\"); proxy_password = mergestring (splitstring(proxy_password, "\""), "\\\""); + // enclose user:password into quotes, it may contain special characters (#338264) string user_pass = (proxy_user != "" ? - " --proxy-user " + proxy_user + (proxy_password != "" ? + " --proxy-user '" + proxy_user + (proxy_password != "" ? ":" + proxy_password : - "") + "") + "'" : ""); // timeout for the connection integer timeout_sec = 90; // %1 = http or ftp proxy, %2 = user:password if any, %3 = URL - // enclose user:password into quotes, it may contain special characters (#338264) - string command = "curl --verbose --proxy %1 '%2' --connect-timeout %3 --url %4"; + string command = "curl --verbose --proxy %1 %2 --connect-timeout %3 --url %4"; string http_command = sformat(command, http_proxy, user_pass, timeout_sec, "http://www.novell.com"); // adding option --insecure to accept the certificate without asking string https_command = sformat(command, https_proxy, user_pass, timeout_sec, "https://secure-www.novell.com --insecure"); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62362 - in /trunk/storage: VERSION package/yast2-storage.changes yast2-storage.spec.in
by aschnell＠svn.opensuse.org 06 Aug '10

06 Aug '10

Author: aschnell Date: Fri Aug 6 11:50:52 2010 New Revision: 62362 URL: http://svn.opensuse.org/viewcvs/yast?rev=62362&view=rev Log: - increased version Modified: trunk/storage/VERSION trunk/storage/package/yast2-storage.changes trunk/storage/yast2-storage.spec.in Modified: trunk/storage/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/VERSION?rev=62362&r1=623… ============================================================================== --- trunk/storage/VERSION (original) +++ trunk/storage/VERSION Fri Aug 6 11:50:52 2010 @@ -1 +1 @@ -2.20.0 +2.20.1 Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Fri Aug 6 11:50:52 2010 @@ -2,6 +2,7 @@ Tue Aug 03 12:45:44 CEST 2010 - aschnell(a)suse.de - increased proposed size for /boot to 150 MB (bnc #627288) +- 2.20.1 ------------------------------------------------------------------- Thu Jul 29 15:53:11 CEST 2010 - fehr(a)suse.de Modified: trunk/storage/yast2-storage.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/yast2-storage.spec.in?re… ============================================================================== --- trunk/storage/yast2-storage.spec.in (original) +++ trunk/storage/yast2-storage.spec.in Fri Aug 6 11:50:52 2010 @@ -5,7 +5,7 @@ License: GPL v2 or later BuildRequires: blocxx-devel boost-devel gcc-c++ libxcrypt-devel openssl-devel sablot swig BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files -BuildRequires: libstorage-devel >= 2.20.0 yast2 >= 2.19.4 yast2-core-devel >= 2.18.1 yast2-devtools +BuildRequires: libstorage-devel >= 2.20.1 yast2 >= 2.19.4 yast2-core-devel >= 2.18.1 yast2-devtools BuildRequires: yast2-testsuite >= 2.19.0 yast2-perl-bindings Requires: libstorage = %(echo `rpm -q --queryformat '%{VERSION}' libstorage`) Requires: yast2-perl-bindings perl = %{perl_version} -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62361 - /tags/stable-2_20_0/security/
by jsuchome＠svn.opensuse.org 06 Aug '10

06 Aug '10

Author: jsuchome Date: Fri Aug 6 11:08:41 2010 New Revision: 62361 URL: http://svn.opensuse.org/viewcvs/yast?rev=62361&view=rev Log: Created tag stable-2_20_0 for security Added: tags/stable-2_20_0/security/ - copied from r62360, trunk/security/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62360 - in /trunk/security: VERSION package/yast2-security.changes testsuite/tests/Level1.out testsuite/tests/Level2.out testsuite/tests/Level3.out testsuite/tests/Read.out testsuite/tests/Write.out
by jsuchome＠svn.opensuse.org 06 Aug '10

06 Aug '10

Author: jsuchome Date: Fri Aug 6 11:08:32 2010 New Revision: 62360 URL: http://svn.opensuse.org/viewcvs/yast?rev=62360&view=rev Log: - testsuite adapted to changes in yast2-pam - 2.20.0 Modified: trunk/security/VERSION trunk/security/package/yast2-security.changes trunk/security/testsuite/tests/Level1.out trunk/security/testsuite/tests/Level2.out trunk/security/testsuite/tests/Level3.out trunk/security/testsuite/tests/Read.out trunk/security/testsuite/tests/Write.out Modified: trunk/security/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/security/VERSION?rev=62360&r1=62… ============================================================================== --- trunk/security/VERSION (original) +++ trunk/security/VERSION Fri Aug 6 11:08:32 2010 @@ -1 +1 @@ -2.19.1 +2.20.0 Modified: trunk/security/package/yast2-security.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/security/package/yast2-security.… ============================================================================== --- trunk/security/package/yast2-security.changes (original) +++ trunk/security/package/yast2-security.changes Fri Aug 6 11:08:32 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Aug 6 11:07:49 CEST 2010 - jsuchome(a)suse.cz + +- testsuite adapted to changes in yast2-pam +- 2.20.0 + +------------------------------------------------------------------- Fri Mar 12 08:05:50 CET 2010 - jsrain(a)suse.cz - renamed the to Security Center and Hardening (fate#309121) Modified: trunk/security/testsuite/tests/Level1.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/security/testsuite/tests/Level1.… ============================================================================== --- trunk/security/testsuite/tests/Level1.out (original) +++ trunk/security/testsuite/tests/Level1.out Fri Aug 6 11:08:32 2010 @@ -79,9 +79,9 @@ Execute .target.bash "/sbin/telinit q" 0 Read .etc.default.passwd."CRYPT_FILES" nil Write .etc.default.passwd."CRYPT_FILES" "blowfish" true -Execute .target.bash_output "pam-config -a --cracklib" $[] -Execute .target.bash_output "pam-config -d --cracklib-minlen" $[] -Execute .target.bash_output "pam-config -d --pwhistory-remember" $[] +Execute .target.bash_output "/usr/sbin/pam-config -a --cracklib" $[] +Execute .target.bash_output "/usr/sbin/pam-config -d --cracklib-minlen" $[] +Execute .target.bash_output "/usr/sbin/pam-config -d --pwhistory-remember" $[] Write .etc.default.passwd nil true Execute .target.bash "echo 1 > /proc/sys/kernel/sysrq" 0 Read .sysconfig.displaymanager.DISPLAYMANAGER "" Modified: trunk/security/testsuite/tests/Level2.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/security/testsuite/tests/Level2.… ============================================================================== --- trunk/security/testsuite/tests/Level2.out (original) +++ trunk/security/testsuite/tests/Level2.out Fri Aug 6 11:08:32 2010 @@ -79,9 +79,9 @@ Execute .target.bash "/sbin/telinit q" 0 Read .etc.default.passwd."CRYPT_FILES" nil Write .etc.default.passwd."CRYPT_FILES" "blowfish" true -Execute .target.bash_output "pam-config -a --cracklib" $[] -Execute .target.bash_output "pam-config -d --cracklib-minlen" $[] -Execute .target.bash_output "pam-config -d --pwhistory-remember" $[] +Execute .target.bash_output "/usr/sbin/pam-config -a --cracklib" $[] +Execute .target.bash_output "/usr/sbin/pam-config -d --cracklib-minlen" $[] +Execute .target.bash_output "/usr/sbin/pam-config -d --pwhistory-remember" $[] Write .etc.default.passwd nil true Execute .target.bash "echo 0 > /proc/sys/kernel/sysrq" 0 Read .sysconfig.displaymanager.DISPLAYMANAGER "" Modified: trunk/security/testsuite/tests/Level3.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/security/testsuite/tests/Level3.… ============================================================================== --- trunk/security/testsuite/tests/Level3.out (original) +++ trunk/security/testsuite/tests/Level3.out Fri Aug 6 11:08:32 2010 @@ -79,10 +79,10 @@ Execute .target.bash "/sbin/telinit q" 0 Read .etc.default.passwd."CRYPT_FILES" nil Write .etc.default.passwd."CRYPT_FILES" "blowfish" true -Execute .target.bash_output "pam-config -a --cracklib" $[] -Execute .target.bash_output "pam-config -a --cracklib" $[] -Execute .target.bash_output "pam-config -a --cracklib-minlen=6" $[] -Execute .target.bash_output "pam-config -d --pwhistory-remember" $[] +Execute .target.bash_output "/usr/sbin/pam-config -a --cracklib" $[] +Execute .target.bash_output "/usr/sbin/pam-config -a --cracklib" $[] +Execute .target.bash_output "/usr/sbin/pam-config -a --cracklib-minlen=6" $[] +Execute .target.bash_output "/usr/sbin/pam-config -d --pwhistory-remember" $[] Write .etc.default.passwd nil true Execute .target.bash "echo 0 > /proc/sys/kernel/sysrq" 0 Read .sysconfig.displaymanager.DISPLAYMANAGER "" Modified: trunk/security/testsuite/tests/Read.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/security/testsuite/tests/Read.ou… ============================================================================== --- trunk/security/testsuite/tests/Read.out (original) +++ trunk/security/testsuite/tests/Read.out Fri Aug 6 11:08:32 2010 @@ -53,6 +53,6 @@ Read .etc.default.passwd."CRYPT_FILES" "blowfish" Read .etc.default.passwd.group_crypt nil Read .etc.default.passwd.crypt "md5" -Execute .target.bash_output "pam-config -q --cracklib" $[] -Execute .target.bash_output "pam-config -q --pwhistory" $[] +Execute .target.bash_output "/usr/sbin/pam-config -q --cracklib" $[] +Execute .target.bash_output "/usr/sbin/pam-config -q --pwhistory" $[] Return true Modified: trunk/security/testsuite/tests/Write.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/security/testsuite/tests/Write.o… ============================================================================== --- trunk/security/testsuite/tests/Write.out (original) +++ trunk/security/testsuite/tests/Write.out Fri Aug 6 11:08:32 2010 @@ -79,9 +79,9 @@ Execute .target.bash "/sbin/telinit q" 0 Read .etc.default.passwd."CRYPT_FILES" nil Write .etc.default.passwd."CRYPT_FILES" "blowfish" true -Execute .target.bash_output "pam-config -d --cracklib" $[] -Execute .target.bash_output "pam-config -d --cracklib-minlen" $[] -Execute .target.bash_output "pam-config -d --pwhistory-remember" $[] +Execute .target.bash_output "/usr/sbin/pam-config -d --cracklib" $[] +Execute .target.bash_output "/usr/sbin/pam-config -d --cracklib-minlen" $[] +Execute .target.bash_output "/usr/sbin/pam-config -d --pwhistory-remember" $[] Write .etc.default.passwd nil true Execute .target.bash "echo 1 > /proc/sys/kernel/sysrq" 0 Read .sysconfig.displaymanager.DISPLAYMANAGER "" -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62359 - /tags/stable-2_20_0/kerberos-client/
by jsuchome＠svn.opensuse.org 06 Aug '10

06 Aug '10

Author: jsuchome Date: Fri Aug 6 11:07:00 2010 New Revision: 62359 URL: http://svn.opensuse.org/viewcvs/yast?rev=62359&view=rev Log: Created tag stable-2_20_0 for kerberos-client Added: tags/stable-2_20_0/kerberos-client/ - copied from r62358, trunk/kerberos-client/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62358 - in /trunk/kerberos-client: VERSION package/yast2-kerberos-client.changes testsuite/tests/Read.out testsuite/tests/Write.out
by jsuchome＠svn.opensuse.org 06 Aug '10

06 Aug '10

Author: jsuchome Date: Fri Aug 6 11:06:47 2010 New Revision: 62358 URL: http://svn.opensuse.org/viewcvs/yast?rev=62358&view=rev Log: - testsuite adapted to changes in yast2-pam - 2.20.0 Modified: trunk/kerberos-client/VERSION trunk/kerberos-client/package/yast2-kerberos-client.changes trunk/kerberos-client/testsuite/tests/Read.out trunk/kerberos-client/testsuite/tests/Write.out Modified: trunk/kerberos-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-client/VERSION?rev=6235… ============================================================================== --- trunk/kerberos-client/VERSION (original) +++ trunk/kerberos-client/VERSION Fri Aug 6 11:06:47 2010 @@ -1 +1 @@ -2.19.0 +2.20.0 Modified: trunk/kerberos-client/package/yast2-kerberos-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-client/package/yast2-ke… ============================================================================== --- trunk/kerberos-client/package/yast2-kerberos-client.changes (original) +++ trunk/kerberos-client/package/yast2-kerberos-client.changes Fri Aug 6 11:06:47 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Aug 6 11:05:12 CEST 2010 - jsuchome(a)suse.cz + +- testsuite adapted to changes in yast2-pam +- 2.20.0 + +------------------------------------------------------------------- Thu Jan 28 15:55:03 CET 2010 - jsuchome(a)suse.cz - leave DNS checkbox disabled when DNS info is not available Modified: trunk/kerberos-client/testsuite/tests/Read.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-client/testsuite/tests/… ============================================================================== --- trunk/kerberos-client/testsuite/tests/Read.out (original) +++ trunk/kerberos-client/testsuite/tests/Read.out Fri Aug 6 11:06:47 2010 @@ -1,5 +1,5 @@ Dump ==== reading... ============================ -Execute .target.bash_output "pam-config -q --krb5" $["stdout":"password: "] +Execute .target.bash_output "/usr/sbin/pam-config -q --krb5" $["stdout":"password: "] Dir .etc.krb5_conf.s: [] Read .etc.krb5_conf.v.libdefaults.default_realm ["SUSE.CZ"] Read .etc.krb5_conf.v.libdefaults.clockskew ["500"] @@ -40,7 +40,7 @@ Dump ssh support: true Dump ============================================ Dump ==== reading... ============================ -Execute .target.bash_output "pam-config -q --krb5" $["stdout":"password: "] +Execute .target.bash_output "/usr/sbin/pam-config -q --krb5" $["stdout":"password: "] Execute .target.bash "/usr/bin/touch /etc/krb5.conf" 0 Dir .etc.ssh.ssh_config.s: ["*"] Dir .etc.ssh.ssh_config.s: ["*"] Modified: trunk/kerberos-client/testsuite/tests/Write.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/kerberos-client/testsuite/tests/… ============================================================================== --- trunk/kerberos-client/testsuite/tests/Write.out (original) +++ trunk/kerberos-client/testsuite/tests/Write.out Fri Aug 6 11:06:47 2010 @@ -1,9 +1,9 @@ Dump ==== writing without any changes ================================= Return true Dump ==== pam enabled with krb5-ignore_unknown_principals= -Execute .target.bash_output "pam-config -a --krb5" $["stdout":""] -Execute .target.bash_output "pam-config -q --ldap" $["stdout":""] -Execute .target.bash_output "pam-config -a --krb5-ignore_unknown_principals" $["stdout":""] +Execute .target.bash_output "/usr/sbin/pam-config -a --krb5" $["stdout":""] +Execute .target.bash_output "/usr/sbin/pam-config -q --ldap" $["stdout":""] +Execute .target.bash_output "/usr/sbin/pam-config -a --krb5-ignore_unknown_principals" $["stdout":""] Return true Dump ==== ssh modified (enabled) ====================================== Write .etc.ssh.ssh_config.v."*"."GSSAPIAuthentication" "yes" true @@ -11,8 +11,8 @@ Write .etc.ssh.ssh_config nil true Return true Dump ==== kerberos disabled, ssh support disabled, krb5.conf untouched= -Execute .target.bash_output "pam-config -q --ldap-account_only" $["stdout":""] -Execute .target.bash_output "pam-config -d --krb5" $["stdout":""] +Execute .target.bash_output "/usr/sbin/pam-config -q --ldap-account_only" $["stdout":""] +Execute .target.bash_output "/usr/sbin/pam-config -d --krb5" $["stdout":""] Write .etc.ssh.ssh_config.v."*"."GSSAPIAuthentication" "no" true Write .etc.ssh.ssh_config.v."*"."GSSAPIDelegateCredentials" "no" true Write .etc.ssh.ssh_config nil true -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62357 - /tags/stable-2_20_1/product-creator/
by jsuchome＠svn.opensuse.org 05 Aug '10

05 Aug '10

Author: jsuchome Date: Thu Aug 5 13:27:59 2010 New Revision: 62357 URL: http://svn.opensuse.org/viewcvs/yast?rev=62357&view=rev Log: Created tag stable-2_20_1 for product-creator Added: tags/stable-2_20_1/product-creator/ - copied from r62356, trunk/product-creator/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62356 - in /trunk/product-creator: VERSION package/yast2-product-creator.changes src/commandline.ycp
by jsuchome＠svn.opensuse.org 05 Aug '10

05 Aug '10

Author: jsuchome Date: Thu Aug 5 13:27:46 2010 New Revision: 62356 URL: http://svn.opensuse.org/viewcvs/yast?rev=62356&view=rev Log: - command line mode fixes: initialize the sources, automatically import GPG keys (bnc#626512) - 2.20.1 Modified: trunk/product-creator/VERSION trunk/product-creator/package/yast2-product-creator.changes trunk/product-creator/src/commandline.ycp Modified: trunk/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/VERSION?rev=6235… ============================================================================== --- trunk/product-creator/VERSION (original) +++ trunk/product-creator/VERSION Thu Aug 5 13:27:46 2010 @@ -1 +1 @@ -2.20.0 +2.20.1 Modified: trunk/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/package/yast2-pr… ============================================================================== --- trunk/product-creator/package/yast2-product-creator.changes (original) +++ trunk/product-creator/package/yast2-product-creator.changes Thu Aug 5 13:27:46 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Aug 5 13:20:49 CEST 2010 - jsuchome(a)suse.cz + +- command line mode fixes: initialize the sources, automatically + import GPG keys (bnc#626512) +- 2.20.1 + +------------------------------------------------------------------- Thu Aug 5 13:16:26 CEST 2010 - jsuchome(a)suse.cz - save config.xml after changing the package list (bnc#599952) Modified: trunk/product-creator/src/commandline.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/commandline.… ============================================================================== --- trunk/product-creator/src/commandline.ycp (original) +++ trunk/product-creator/src/commandline.ycp Thu Aug 5 13:27:46 2010 @@ -13,9 +13,15 @@ import "Progress"; import "ProductCreator"; import "RichText"; + import "SourceManager"; textdomain "product-creator"; + // dummy function to return true when callback is invoked (from AutoInstall.ycp) + define boolean callbackTrue_boolean_map_integer(map<string,any> dummy_map, integer dummy) { + return true; + } + void ProcessConfigFileOption(map params) { if (haskey(params, "configfile")) @@ -156,6 +162,20 @@ ProductCreator::Readisolinux(); } + if (action != "show") + { + // initialize the sources before commiting configuration + + ProductCreator::ResetArch(); + // unload all active sources (reset the internal state, see bnc#469191) + Pkg::SourceFinishAll(); + + SourceManager::ReadSources(); + + // automatically import GPG keys when adding repository + Pkg::CallbackImportGpgKey (callbackTrue_boolean_map_integer); + } + // save the new configuration into global map, parse autoyast profile ProductCreator::CommitConfig (); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62355 - /tags/branch-Code-11-SP1-2_17_37/product-creator/
by jsuchome＠svn.opensuse.org 05 Aug '10

05 Aug '10

Author: jsuchome Date: Thu Aug 5 13:27:43 2010 New Revision: 62355 URL: http://svn.opensuse.org/viewcvs/yast?rev=62355&view=rev Log: Created tag branch-Code-11-SP1-2_17_37 for product-creator Added: tags/branch-Code-11-SP1-2_17_37/product-creator/ (props changed) - copied from r62354, branches/SuSE-Code-11-SP1-Branch/product-creator/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62354 - in /branches/SuSE-Code-11-SP1-Branch/product-creator: VERSION package/yast2-product-creator.changes src/commandline.ycp
by jsuchome＠svn.opensuse.org 05 Aug '10

05 Aug '10

Author: jsuchome Date: Thu Aug 5 13:27:33 2010 New Revision: 62354 URL: http://svn.opensuse.org/viewcvs/yast?rev=62354&view=rev Log: - command line mode fixes: initialize the sources, automatically import GPG keys (bnc#626512) - 2.17.37 Modified: branches/SuSE-Code-11-SP1-Branch/product-creator/VERSION branches/SuSE-Code-11-SP1-Branch/product-creator/package/yast2-product-creator.changes branches/SuSE-Code-11-SP1-Branch/product-creator/src/commandline.ycp Modified: branches/SuSE-Code-11-SP1-Branch/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/produ… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/product-creator/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/product-creator/VERSION Thu Aug 5 13:27:33 2010 @@ -1 +1 @@ -2.17.36 +2.17.37 Modified: branches/SuSE-Code-11-SP1-Branch/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/produ… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/product-creator/package/yast2-product-creator.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/product-creator/package/yast2-product-creator.changes Thu Aug 5 13:27:33 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Aug 5 13:19:11 CEST 2010 - jsuchome(a)suse.cz + +- command line mode fixes: initialize the sources, automatically + import GPG keys (bnc#626512) +- 2.17.37 + +------------------------------------------------------------------- Wed Jul 28 15:30:51 CEST 2010 - jsuchome(a)suse.cz - save config.xml after changing the package list (bnc#599952) Modified: branches/SuSE-Code-11-SP1-Branch/product-creator/src/commandline.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/produ… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/product-creator/src/commandline.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/product-creator/src/commandline.ycp Thu Aug 5 13:27:33 2010 @@ -13,9 +13,15 @@ import "Progress"; import "ProductCreator"; import "RichText"; + import "SourceManager"; textdomain "product-creator"; + // dummy function to return true when callback is invoked (from AutoInstall.ycp) + define boolean callbackTrue_boolean_map_integer(map<string,any> dummy_map, integer dummy) { + return true; + } + void ProcessConfigFileOption(map params) { if (haskey(params, "configfile")) @@ -156,6 +162,20 @@ ProductCreator::Readisolinux(); } + if (action != "show") + { + // initialize the sources before commiting configuration + + ProductCreator::ResetArch(); + // unload all active sources (reset the internal state, see bnc#469191) + Pkg::SourceFinishAll(); + + SourceManager::ReadSources(); + + // automatically import GPG keys when adding repository + Pkg::CallbackImportGpgKey (callbackTrue_boolean_map_integer); + } + // save the new configuration into global map, parse autoyast profile ProductCreator::CommitConfig (); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62353 - /tags/branch-Code-11-2_17_26_1/product-creator/
by jsuchome＠svn.opensuse.org 05 Aug '10

05 Aug '10

Author: jsuchome Date: Thu Aug 5 13:25:02 2010 New Revision: 62353 URL: http://svn.opensuse.org/viewcvs/yast?rev=62353&view=rev Log: Created tag branch-Code-11-2_17_26_1 for product-creator Added: tags/branch-Code-11-2_17_26_1/product-creator/ - copied from r62352, branches/SuSE-Code-11-Branch/product-creator/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62352 - /tags/branch-Code-11-2_17_26_1/
by jsuchome＠svn.opensuse.org 05 Aug '10

05 Aug '10

Author: jsuchome Date: Thu Aug 5 13:24:59 2010 New Revision: 62352 URL: http://svn.opensuse.org/viewcvs/yast?rev=62352&view=rev Log: Created tag branch-Code-11-2_17_26_1 Added: tags/branch-Code-11-2_17_26_1/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62351 - in /branches/SuSE-Code-11-Branch/product-creator: VERSION package/yast2-product-creator.changes src/commandline.ycp
by jsuchome＠svn.opensuse.org 05 Aug '10

05 Aug '10

Author: jsuchome Date: Thu Aug 5 13:24:55 2010 New Revision: 62351 URL: http://svn.opensuse.org/viewcvs/yast?rev=62351&view=rev Log: - command line mode fixes: initialize the sources, automatically import GPG keys (bnc#626512) - 2.17.26.1 Modified: branches/SuSE-Code-11-Branch/product-creator/VERSION branches/SuSE-Code-11-Branch/product-creator/package/yast2-product-creator.changes branches/SuSE-Code-11-Branch/product-creator/src/commandline.ycp Modified: branches/SuSE-Code-11-Branch/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/product-c… ============================================================================== --- branches/SuSE-Code-11-Branch/product-creator/VERSION (original) +++ branches/SuSE-Code-11-Branch/product-creator/VERSION Thu Aug 5 13:24:55 2010 @@ -1 +1 @@ -2.17.26 +2.17.26.1 Modified: branches/SuSE-Code-11-Branch/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/product-c… ============================================================================== --- branches/SuSE-Code-11-Branch/product-creator/package/yast2-product-creator.changes (original) +++ branches/SuSE-Code-11-Branch/product-creator/package/yast2-product-creator.changes Thu Aug 5 13:24:55 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Aug 5 13:11:34 CEST 2010 - jsuchome(a)suse.cz + +- command line mode fixes: initialize the sources, automatically + import GPG keys (bnc#626512) +- 2.17.26.1 + +------------------------------------------------------------------- Mon Aug 3 15:32:25 CEST 2009 - jsuchome(a)suse.cz - give kiwi more time to finish (bnc#525986) Modified: branches/SuSE-Code-11-Branch/product-creator/src/commandline.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/product-c… ============================================================================== --- branches/SuSE-Code-11-Branch/product-creator/src/commandline.ycp (original) +++ branches/SuSE-Code-11-Branch/product-creator/src/commandline.ycp Thu Aug 5 13:24:55 2010 @@ -13,9 +13,15 @@ import "Progress"; import "ProductCreator"; import "RichText"; + import "SourceManager"; textdomain "product-creator"; + // dummy function to return true when callback is invoked (from AutoInstall.ycp) + define boolean callbackTrue_boolean_map_integer(map<string,any> dummy_map, integer dummy) { + return true; + } + void ProcessConfigFileOption(map params) { if (haskey(params, "configfile")) @@ -156,6 +162,20 @@ ProductCreator::Readisolinux(); } + if (action != "show") + { + // initialize the sources before commiting configuration + + ProductCreator::ResetArch(); + // unload all active sources (reset the internal state, see bnc#469191) + Pkg::SourceFinishAll(); + + SourceManager::ReadSources(); + + // automatically import GPG keys when adding repository + Pkg::CallbackImportGpgKey (callbackTrue_boolean_map_integer); + } + // save the new configuration into global map, parse autoyast profile ProductCreator::CommitConfig (); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62350 - /tags/stable-2_20_0/product-creator/
by jsuchome＠svn.opensuse.org 05 Aug '10

05 Aug '10

Author: jsuchome Date: Thu Aug 5 13:18:27 2010 New Revision: 62350 URL: http://svn.opensuse.org/viewcvs/yast?rev=62350&view=rev Log: Created tag stable-2_20_0 for product-creator Added: tags/stable-2_20_0/product-creator/ - copied from r62349, trunk/product-creator/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62349 - in /trunk/product-creator: VERSION package/yast2-product-creator.changes src/dialogs.ycp src/kiwi_dialogs.ycp
by jsuchome＠svn.opensuse.org 05 Aug '10

05 Aug '10

Author: jsuchome Date: Thu Aug 5 13:18:20 2010 New Revision: 62349 URL: http://svn.opensuse.org/viewcvs/yast?rev=62349&view=rev Log: - save config.xml after changing the package list (bnc#599952) - offer more options when packages are not available (bnc#599952) - check for package dependencies automatically (bnc#599952) - 2.20.0 Modified: trunk/product-creator/VERSION trunk/product-creator/package/yast2-product-creator.changes trunk/product-creator/src/dialogs.ycp trunk/product-creator/src/kiwi_dialogs.ycp Modified: trunk/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/VERSION?rev=6234… ============================================================================== --- trunk/product-creator/VERSION (original) +++ trunk/product-creator/VERSION Thu Aug 5 13:18:20 2010 @@ -1 +1 @@ -2.19.10 +2.20.0 Modified: trunk/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/package/yast2-pr… ============================================================================== --- trunk/product-creator/package/yast2-product-creator.changes (original) +++ trunk/product-creator/package/yast2-product-creator.changes Thu Aug 5 13:18:20 2010 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Thu Aug 5 13:16:26 CEST 2010 - jsuchome(a)suse.cz + +- save config.xml after changing the package list (bnc#599952) +- offer more options when packages are not available (bnc#599952) +- check for package dependencies automatically (bnc#599952) +- 2.20.0 + +------------------------------------------------------------------- Thu Apr 29 18:02:40 CEST 2010 - jsuchome(a)suse.cz - remember the directory of the saved configuration (bnc#600922) Modified: trunk/product-creator/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/dialogs.ycp?… ============================================================================== --- trunk/product-creator/src/dialogs.ycp (original) +++ trunk/product-creator/src/dialogs.ycp Thu Aug 5 13:18:20 2010 @@ -1246,6 +1246,25 @@ return result; } + boolean InstallPackageOrProvider (string p) { + + boolean selected = Pkg::PkgInstall(p); + y2milestone("selecting package for installation: %1 -> %2", p, selected); + if (!selected) + { + list <list> provides = Pkg::PkgQueryProvides (p); + provides = filter (list l, provides, { + return l[1]:`NONE != `NONE; + }); + string pp = provides[0,0]:""; + if (pp != "") + { + y2milestone("selecting first package providing %1: %2 -> %3", p, pp, Pkg::PkgInstall (pp)); + } + } + + } + /** * Display package selection dialog with preselected packages. * @param base_pattern base pattern to install, can be empty ("") if there is no base pattern @@ -1342,20 +1361,7 @@ { foreach(string p, packages, { - boolean selected = Pkg::PkgInstall(p); - y2milestone("selecting package for installation: %1 -> %2", p, selected); - if (!selected) - { - list <list> provides = Pkg::PkgQueryProvides (p); - provides = filter (list l, provides, { - return l[1]:`NONE != `NONE; - }); - string pp = provides[0,0]:""; - if (pp != "") - { - y2milestone("selecting first package providing %1: %2 -> %3", p, pp, Pkg::PkgInstall (pp)); - } - } + InstallPackageOrProvider (p); }); } @@ -1512,7 +1518,7 @@ y2milestone("Selected packages: %1 ", size(Pkg::GetPackages(`selected, true))); // activate the selections - boolean solved = Pkg::PkgSolve(true); + boolean solved = (ret == `cancel || Pkg::PkgSolve(true)); if (!solved) { @@ -1531,7 +1537,7 @@ list seladd = []; list selbase = []; - if ( ret != `back ) + if ( ret != `back && ret != `cancel) { if (!using_patterns) { Modified: trunk/product-creator/src/kiwi_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/kiwi_dialogs… ============================================================================== --- trunk/product-creator/src/kiwi_dialogs.ycp (original) +++ trunk/product-creator/src/kiwi_dialogs.ycp Thu Aug 5 13:18:20 2010 @@ -223,14 +223,12 @@ UI::ChangeWidget (`id (id), `Value, pat + pac + ign); } + /** - * Handler for software selection + * open package selector with given set of packages, return modified set + * or nil on cancel */ - define symbol HandleSWSelection (string key, map event) { - if (event["ID"]:nil == key) - { - integer package_set = KiwiConfig["package_set"]:0; - map sw_contents = KiwiConfig["packages",package_set]:$[]; + define map modifyPackageSelection (map sw_contents) { integer mbytes = (integer) UI::QueryWidget (`id ("size"), `Value); if (UI::QueryWidget (`id ("sizeunit"), `Value) == "G") @@ -249,7 +247,7 @@ ``(pat["name"]:"")), `packages ); - if (ret_map["ui"]:nil == `cancel) + if (ret_map["ui"]:nil == `cancel || ret_map["ui"]:nil == `failed) return nil; sw_contents["opensusePattern"] = maplist (string name, ret_map["addons"]:[], ``($[ "name" : name])); @@ -257,7 +255,20 @@ ret_map["packages"]:[], ``($[ "name" : name])); sw_contents["ignore"] = maplist (string name, ret_map["taboo"]:[], ``($[ "name" : name])); - KiwiConfig["packages",package_set] = sw_contents; + + return sw_contents; + } + + /** + * Handler for software selection + */ + define symbol HandleSWSelection (string key, map event) { + if (event["ID"]:nil == key) + { + integer package_set = KiwiConfig["package_set"]:0; + map sw_contents = modifyPackageSelection (KiwiConfig["packages",package_set]:$[]); + if (sw_contents != nil) + KiwiConfig["packages",package_set] = sw_contents; InitSWRichText ("rt_sw"); } return nil; @@ -962,6 +973,128 @@ } /** + * Check if selected packages are available (some of them may not after + * deleting some repository) + * return true if there was no conflict + */ + define symbol CheckForAvailablePackages (boolean ignore_allowed) { + + list<map> packages_section = KiwiConfig["packages"]:[]; + integer index = 0; + symbol ret = `ok; + foreach (map pmap, packages_section, { + string type = pmap["type"]:""; + if (type != "delete") + { + Popup::ShowFeedback (_("Checking packages availability..."), _("Please wait...")); + list<string> n_a = []; + foreach (map p, pmap["package"]:[], { + if (p["name"]:"" != "" && !Pkg::IsAvailable (p["name"]:"")) + n_a = add (n_a, p["name"]:""); + }); + Popup::ClearFeedback (); + if (size (n_a) > 0) + { + ret = `missing; + string type_label = section_type_label[type]:type; + + UI::OpenDialog (`opt (`decorated), `HBox (`VSpacing (25), + `VBox ( + `HSpacing (70), + `Left(`Heading (_("Missing packages"))), + `VSpacing(0.2), + // popup text + `RichText (sformat (_("These packages from section '%1' are not available with selected repositories: +%2. + +You can remove the packages from the section, check the detailed package selection or ignore the situation. + +Going to detailed package selection and accepting the view without any further changes results in removal of problematic packages from the section. +"), type_label, mergestring (sort (n_a), " "))), + `HBox ( + // button label + `PushButton (`id (`remove), `opt (`default), _("Remove the packages")), + // button label + `PushButton (`id (`selection), _("Check package selection")), + // button label + `PushButton (`id (`ignore), ignore_allowed ? _("Ignore") : _("Cancel")) + ) + ) + )); + any r = UI::UserInput (); + UI::CloseDialog (); + if (r == `remove) + { + KiwiConfig["packages",index,"package"] = filter (map p, pmap["package"]:[], { + return !contains (n_a, p["name"]:""); + }); + ret = `removed; + } + if (r == `selection) + { + map sw_contents = modifyPackageSelection (KiwiConfig["packages",index]:$[]); + if (sw_contents != nil) + { + KiwiConfig["packages",index] = sw_contents; + ret = `selection; + } + } + } + } + index = index + 1; + }); + + return ret; + } + + /** + * Check if all selected packages and patterns can be installed + * If dependency problem was found, open package selector. + * Return false if package selector was canceled + */ + define boolean CheckPackageDependencies () { + + boolean ret = true; + + list<map> packages_section = KiwiConfig["packages"]:[]; + integer index = 0; + foreach (map pmap, packages_section, { + string type = pmap["type"]:""; + if (type != "delete") + { + Pkg::ResolvableNeutral ("", `package, true); + Pkg::ResolvableNeutral ("", `pattern, true); + + foreach (map pat, pmap["opensusePattern"]:[], { + Pkg::ResolvableInstall(pat["name"]:"", `pattern); + }); + + ProductCreator::MarkTaboo (maplist (map i, pmap["ignore"]:[], ``(i["name"]:""))); + + foreach (map p, KiwiConfig["packages",index,"package"]:[], { + InstallPackageOrProvider (p["name"]:""); + }); + + boolean solved = Pkg::PkgSolve (true); + if (!solved) + { + map sw_contents = modifyPackageSelection (KiwiConfig["packages",index]:$[]); + if (sw_contents != nil) + { + KiwiConfig["packages",index] = sw_contents; + } + else + { + ret = false; + } + } + } + index = index + 1; + }); + return ret; + } + + /** * handler for main action: create the iso image with kiwi */ define boolean CreateImage (string key, map event) { @@ -1040,7 +1173,6 @@ directory."), ]; - Kiwi::WriteConfigXML (KiwiConfig, kiwi_task); boolean create_image_now = false; string selected_profiles = ""; if (size (KiwiConfig["profiles"]:[]) > 0) @@ -1095,6 +1227,21 @@ } if (create_image_now) { + if (CheckForAvailablePackages (false) == `missing) + { + y2milestone ("there were missing packages, not going to build"); + InitSWRichText ("rt_sw"); + return false; + } + if (!CheckPackageDependencies ()) + { + y2milestone ("there was unresolved dependency problem, not going to build"); + InitSWRichText ("rt_sw"); + return false; + } + // write XML now, after possible modification of the package list + Kiwi::WriteConfigXML (KiwiConfig, kiwi_task); + string out_dir = KiwiConfig["iso-directory"]:""; if (FileUtils::CheckAndCreatePath (out_dir) && Kiwi::PrepareAndCreate (out_dir, selected_profiles)) @@ -1121,6 +1268,11 @@ ret = false; } } + else + { + Kiwi::WriteConfigXML (KiwiConfig, kiwi_task); + } + string dir = Kiwi::SaveConfiguration (KiwiConfig, kiwi_task); if (dir != nil && dir != "") { @@ -1201,8 +1353,8 @@ }); KiwiConfig["import_files"] = import_files; - map<string,any> read_config = Kiwi::ReadConfigXML (kiwi_configuration); + if (!KiwiConfig["_imported"]:false) { // "type" had different meaning in ProductCreator::Config... @@ -1864,37 +2016,6 @@ ]; } -/** - * Check if selected packages are available (some of them may not after - * deleting some repository) - */ -define boolean CheckForAvailablePackages () { - - Popup::ShowFeedback (_("Checking packages availability..."), _("Please wait...")); - foreach (map pmap, KiwiConfig["packages"]:[], { - string type = pmap["type"]:""; - if (type != "delete") - { - list<string> n_a = []; - foreach (map p, pmap["package"]:[], { - if (p["name"]:"" != "" && !Package::Available (p["name"]:"")) - n_a = add (n_a, p["name"]:""); - }); - if (size (n_a) > 0) - { - string type_label = section_type_label[type]:type; - // popup headline - Popup::LongText (_("Missing packages"), - // popup text - `RichText (sformat (_("These packages from section '%1' are not available with selected repositories: -%2. -Check the list of packages and package repositories."), type_label, mergestring (sort (n_a), " "))), 70, 25); - } - } - }); - Popup::ClearFeedback (); - return true; -} /** * Main dialog for Kiwi image configuration @@ -1903,7 +2024,10 @@ InitImageConfiguration (); -CheckForAvailablePackages (); +if (CheckForAvailablePackages (true) != `selection) +{ + CheckPackageDependencies (); +} map<string, map> widget_descr = get_widget_description (); widget_descr["tab"] = CWMTab::CreateWidget($[ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62348 - /tags/branch-Code-11-SP1-2_17_36/product-creator/
by jsuchome＠svn.opensuse.org 05 Aug '10

05 Aug '10

Author: jsuchome Date: Thu Aug 5 13:17:57 2010 New Revision: 62348 URL: http://svn.opensuse.org/viewcvs/yast?rev=62348&view=rev Log: Created tag branch-Code-11-SP1-2_17_36 for product-creator Added: tags/branch-Code-11-SP1-2_17_36/product-creator/ (props changed) - copied from r62347, branches/SuSE-Code-11-SP1-Branch/product-creator/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62347 - in /branches/SuSE-Code-11-SP1-Branch/product-creator: VERSION package/yast2-product-creator.changes src/dialogs.ycp src/kiwi_dialogs.ycp
by jsuchome＠svn.opensuse.org 05 Aug '10

05 Aug '10

Author: jsuchome Date: Thu Aug 5 13:17:44 2010 New Revision: 62347 URL: http://svn.opensuse.org/viewcvs/yast?rev=62347&view=rev Log: - save config.xml after changing the package list (bnc#599952) - offer more options when packages are not available (bnc#599952) - check for package dependencies automatically (bnc#599952) - 2.17.36 Modified: branches/SuSE-Code-11-SP1-Branch/product-creator/VERSION branches/SuSE-Code-11-SP1-Branch/product-creator/package/yast2-product-creator.changes branches/SuSE-Code-11-SP1-Branch/product-creator/src/dialogs.ycp branches/SuSE-Code-11-SP1-Branch/product-creator/src/kiwi_dialogs.ycp Modified: branches/SuSE-Code-11-SP1-Branch/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/produ… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/product-creator/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/product-creator/VERSION Thu Aug 5 13:17:44 2010 @@ -1 +1 @@ -2.17.35 +2.17.36 Modified: branches/SuSE-Code-11-SP1-Branch/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/produ… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/product-creator/package/yast2-product-creator.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/product-creator/package/yast2-product-creator.changes Thu Aug 5 13:17:44 2010 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Wed Jul 28 15:30:51 CEST 2010 - jsuchome(a)suse.cz + +- save config.xml after changing the package list (bnc#599952) +- offer more options when packages are not available (bnc#599952) +- check for package dependencies automatically (bnc#599952) +- 2.17.36 + +------------------------------------------------------------------- Thu Apr 29 17:54:06 CEST 2010 - jsuchome(a)suse.cz - remember the directory of the saved configuration (bnc#600922) Modified: branches/SuSE-Code-11-SP1-Branch/product-creator/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/produ… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/product-creator/src/dialogs.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/product-creator/src/dialogs.ycp Thu Aug 5 13:17:44 2010 @@ -1246,6 +1246,25 @@ return result; } + boolean InstallPackageOrProvider (string p) { + + boolean selected = Pkg::PkgInstall(p); + y2milestone("selecting package for installation: %1 -> %2", p, selected); + if (!selected) + { + list <list> provides = Pkg::PkgQueryProvides (p); + provides = filter (list l, provides, { + return l[1]:`NONE != `NONE; + }); + string pp = provides[0,0]:""; + if (pp != "") + { + y2milestone("selecting first package providing %1: %2 -> %3", p, pp, Pkg::PkgInstall (pp)); + } + } + + } + /** * Display package selection dialog with preselected packages. * @param base_pattern base pattern to install, can be empty ("") if there is no base pattern @@ -1342,20 +1361,7 @@ { foreach(string p, packages, { - boolean selected = Pkg::PkgInstall(p); - y2milestone("selecting package for installation: %1 -> %2", p, selected); - if (!selected) - { - list <list> provides = Pkg::PkgQueryProvides (p); - provides = filter (list l, provides, { - return l[1]:`NONE != `NONE; - }); - string pp = provides[0,0]:""; - if (pp != "") - { - y2milestone("selecting first package providing %1: %2 -> %3", p, pp, Pkg::PkgInstall (pp)); - } - } + InstallPackageOrProvider (p); }); } @@ -1512,7 +1518,7 @@ y2milestone("Selected packages: %1 ", size(Pkg::GetPackages(`selected, true))); // activate the selections - boolean solved = Pkg::PkgSolve(true); + boolean solved = (ret == `cancel || Pkg::PkgSolve(true)); if (!solved) { @@ -1531,7 +1537,7 @@ list seladd = []; list selbase = []; - if ( ret != `back ) + if ( ret != `back && ret != `cancel) { if (!using_patterns) { Modified: branches/SuSE-Code-11-SP1-Branch/product-creator/src/kiwi_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/produ… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/product-creator/src/kiwi_dialogs.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/product-creator/src/kiwi_dialogs.ycp Thu Aug 5 13:17:44 2010 @@ -223,14 +223,12 @@ UI::ChangeWidget (`id (id), `Value, pat + pac + ign); } + /** - * Handler for software selection + * open package selector with given set of packages, return modified set + * or nil on cancel */ - define symbol HandleSWSelection (string key, map event) { - if (event["ID"]:nil == key) - { - integer package_set = KiwiConfig["package_set"]:0; - map sw_contents = KiwiConfig["packages",package_set]:$[]; + define map modifyPackageSelection (map sw_contents) { integer mbytes = (integer) UI::QueryWidget (`id ("size"), `Value); if (UI::QueryWidget (`id ("sizeunit"), `Value) == "G") @@ -249,7 +247,7 @@ ``(pat["name"]:"")), `packages ); - if (ret_map["ui"]:nil == `cancel) + if (ret_map["ui"]:nil == `cancel || ret_map["ui"]:nil == `failed) return nil; sw_contents["opensusePattern"] = maplist (string name, ret_map["addons"]:[], ``($[ "name" : name])); @@ -257,7 +255,20 @@ ret_map["packages"]:[], ``($[ "name" : name])); sw_contents["ignore"] = maplist (string name, ret_map["taboo"]:[], ``($[ "name" : name])); - KiwiConfig["packages",package_set] = sw_contents; + + return sw_contents; + } + + /** + * Handler for software selection + */ + define symbol HandleSWSelection (string key, map event) { + if (event["ID"]:nil == key) + { + integer package_set = KiwiConfig["package_set"]:0; + map sw_contents = modifyPackageSelection (KiwiConfig["packages",package_set]:$[]); + if (sw_contents != nil) + KiwiConfig["packages",package_set] = sw_contents; InitSWRichText ("rt_sw"); } return nil; @@ -962,6 +973,128 @@ } /** + * Check if selected packages are available (some of them may not after + * deleting some repository) + * return true if there was no conflict + */ + define symbol CheckForAvailablePackages (boolean ignore_allowed) { + + list<map> packages_section = KiwiConfig["packages"]:[]; + integer index = 0; + symbol ret = `ok; + foreach (map pmap, packages_section, { + string type = pmap["type"]:""; + if (type != "delete") + { + Popup::ShowFeedback (_("Checking packages availability..."), _("Please wait...")); + list<string> n_a = []; + foreach (map p, pmap["package"]:[], { + if (p["name"]:"" != "" && !Pkg::IsAvailable (p["name"]:"")) + n_a = add (n_a, p["name"]:""); + }); + Popup::ClearFeedback (); + if (size (n_a) > 0) + { + ret = `missing; + string type_label = section_type_label[type]:type; + + UI::OpenDialog (`opt (`decorated), `HBox (`VSpacing (25), + `VBox ( + `HSpacing (70), + `Left(`Heading (_("Missing packages"))), + `VSpacing(0.2), + // popup text + `RichText (sformat (_("These packages from section '%1' are not available with selected repositories: +%2. + +You can remove the packages from the section, check the detailed package selection or ignore the situation. + +Going to detailed package selection and accepting the view without any further changes results in removal of problematic packages from the section. +"), type_label, mergestring (sort (n_a), " "))), + `HBox ( + // button label + `PushButton (`id (`remove), `opt (`default), _("Remove the packages")), + // button label + `PushButton (`id (`selection), _("Check package selection")), + // button label + `PushButton (`id (`ignore), ignore_allowed ? _("Ignore") : _("Cancel")) + ) + ) + )); + any r = UI::UserInput (); + UI::CloseDialog (); + if (r == `remove) + { + KiwiConfig["packages",index,"package"] = filter (map p, pmap["package"]:[], { + return !contains (n_a, p["name"]:""); + }); + ret = `removed; + } + if (r == `selection) + { + map sw_contents = modifyPackageSelection (KiwiConfig["packages",index]:$[]); + if (sw_contents != nil) + { + KiwiConfig["packages",index] = sw_contents; + ret = `selection; + } + } + } + } + index = index + 1; + }); + + return ret; + } + + /** + * Check if all selected packages and patterns can be installed + * If dependency problem was found, open package selector. + * Return false if package selector was canceled + */ + define boolean CheckPackageDependencies () { + + boolean ret = true; + + list<map> packages_section = KiwiConfig["packages"]:[]; + integer index = 0; + foreach (map pmap, packages_section, { + string type = pmap["type"]:""; + if (type != "delete") + { + Pkg::ResolvableNeutral ("", `package, true); + Pkg::ResolvableNeutral ("", `pattern, true); + + foreach (map pat, pmap["opensusePattern"]:[], { + Pkg::ResolvableInstall(pat["name"]:"", `pattern); + }); + + ProductCreator::MarkTaboo (maplist (map i, pmap["ignore"]:[], ``(i["name"]:""))); + + foreach (map p, KiwiConfig["packages",index,"package"]:[], { + InstallPackageOrProvider (p["name"]:""); + }); + + boolean solved = Pkg::PkgSolve (true); + if (!solved) + { + map sw_contents = modifyPackageSelection (KiwiConfig["packages",index]:$[]); + if (sw_contents != nil) + { + KiwiConfig["packages",index] = sw_contents; + } + else + { + ret = false; + } + } + } + index = index + 1; + }); + return ret; + } + + /** * handler for main action: create the iso image with kiwi */ define boolean CreateImage (string key, map event) { @@ -1040,7 +1173,6 @@ directory."), ]; - Kiwi::WriteConfigXML (KiwiConfig, kiwi_task); boolean create_image_now = false; string selected_profiles = ""; if (size (KiwiConfig["profiles"]:[]) > 0) @@ -1095,6 +1227,21 @@ } if (create_image_now) { + if (CheckForAvailablePackages (false) == `missing) + { + y2milestone ("there were missing packages, not going to build"); + InitSWRichText ("rt_sw"); + return false; + } + if (!CheckPackageDependencies ()) + { + y2milestone ("there was unresolved dependency problem, not going to build"); + InitSWRichText ("rt_sw"); + return false; + } + // write XML now, after possible modification of the package list + Kiwi::WriteConfigXML (KiwiConfig, kiwi_task); + string out_dir = KiwiConfig["iso-directory"]:""; if (FileUtils::CheckAndCreatePath (out_dir) && Kiwi::PrepareAndCreate (out_dir, selected_profiles)) @@ -1121,6 +1268,11 @@ ret = false; } } + else + { + Kiwi::WriteConfigXML (KiwiConfig, kiwi_task); + } + string dir = Kiwi::SaveConfiguration (KiwiConfig, kiwi_task); if (dir != nil && dir != "") { @@ -1204,8 +1356,8 @@ }); KiwiConfig["import_files"] = import_files; - map<string,any> read_config = Kiwi::ReadConfigXML (kiwi_configuration); + if (!KiwiConfig["_imported"]:false) { // "type" had different meaning in ProductCreator::Config... @@ -1867,37 +2019,6 @@ ]; } -/** - * Check if selected packages are available (some of them may not after - * deleting some repository) - */ -define boolean CheckForAvailablePackages () { - - Popup::ShowFeedback (_("Checking packages availability..."), _("Please wait...")); - foreach (map pmap, KiwiConfig["packages"]:[], { - string type = pmap["type"]:""; - if (type != "delete") - { - list<string> n_a = []; - foreach (map p, pmap["package"]:[], { - if (p["name"]:"" != "" && !Package::Available (p["name"]:"")) - n_a = add (n_a, p["name"]:""); - }); - if (size (n_a) > 0) - { - string type_label = section_type_label[type]:type; - // popup headline - Popup::LongText (_("Missing packages"), - // popup text - `RichText (sformat (_("These packages from section '%1' are not available with selected repositories: -%2. -Check the list of packages and package repositories."), type_label, mergestring (sort (n_a), " "))), 70, 25); - } - } - }); - Popup::ClearFeedback (); - return true; -} /** * Main dialog for Kiwi image configuration @@ -1906,7 +2027,10 @@ InitImageConfiguration (); -CheckForAvailablePackages (); +if (CheckForAvailablePackages (true) != `selection) +{ + CheckPackageDependencies (); +} map<string, map> widget_descr = get_widget_description (); widget_descr["tab"] = CWMTab::CreateWidget($[ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62346 - in /branches/tmp/jsrain/unattended-migration/autoinstallation: autoyast2.spec.in src/clients/inst_autosetup_upgrade.ycp src/clients/inst_store_upgrade_software.ycp
by jsrain＠svn.opensuse.org 05 Aug '10

05 Aug '10

Author: jsrain Date: Thu Aug 5 11:30:03 2010 New Revision: 62346 URL: http://svn.opensuse.org/viewcvs/yast?rev=62346&view=rev Log: updated software selection dumping updated file list Modified: branches/tmp/jsrain/unattended-migration/autoinstallation/autoyast2.spec.in branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/inst_autosetup_upgrade.ycp branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/inst_store_upgrade_software.ycp Modified: branches/tmp/jsrain/unattended-migration/autoinstallation/autoyast2.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsrain/unattended-migrati… ============================================================================== --- branches/tmp/jsrain/unattended-migration/autoinstallation/autoyast2.spec.in (original) +++ branches/tmp/jsrain/unattended-migration/autoinstallation/autoyast2.spec.in Thu Aug 5 11:30:03 2010 @@ -189,6 +189,9 @@ @clientdir@/autoinst_scripts1_finish.ycp @clientdir@/autoinst_scripts2_finish.ycp @clientdir@/ayast_probe.ycp +@clientdir@/inst_autosetup_upgrade.ycp +@clientdir@/inst_store_upgrade_software.ycp + @yncludedir@/autoinstall/xml.ycp @yncludedir@/autoinstall/ask.ycp Modified: branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/inst_autosetup_upgrade.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsrain/unattended-migrati… ============================================================================== --- branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/inst_autosetup_upgrade.ycp (original) +++ branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/inst_autosetup_upgrade.ycp Thu Aug 5 11:30:03 2010 @@ -409,7 +409,11 @@ if (Pkg::PkgSolve (!Update::onlyUpdateInstalled)) Update::solve_errors = 0; else - Update::solve_errors = Pkg::PkgSolveErrors (); + { + Update::solve_errors = Pkg::PkgSolveErrors (); + if (Profile::current["upgrade","stop_on_solver_conflict"]:true) + AutoinstConfig::Confirm = true; + } } Modified: branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/inst_store_upgrade_software.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsrain/unattended-migrati… ============================================================================== --- branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/inst_store_upgrade_software.ycp (original) +++ branches/tmp/jsrain/unattended-migration/autoinstallation/src/clients/inst_store_upgrade_software.ycp Thu Aug 5 11:30:03 2010 @@ -10,40 +10,40 @@ // find out status of patterns list<map<string,any> > patterns = Pkg::ResolvableProperties ("", `pattern, ""); patterns = filter (map<string,any> p, patterns, { - return p["status"]:nil == `selected || p["status"]:nil == `removed; - }); - patterns = filter (map<string,any> p, patterns, { return p["transact_by"]:nil == `user || p["transact_by"]:nil == `app_high; }); list<string> patterns_to_remove = []; list<string> patterns_to_install = maplist (map<string,any> p, patterns, { - if (p["status"]:nil == `selected) + if (p["status"]:nil == `selected || p["status"]:nil == `installed) return p["name"]:""; - else + else if (p["status"]:nil == `removed || p["status"]:nil == `available) patterns_to_remove = add (patterns_to_remove, p["name"]:""); return nil; }); + patterns_to_install = filter (string p, patterns_to_install, { + return p != nil; + }); y2internal ("Patterns to install: %1", patterns_to_install); y2internal ("Patterns to remove: %1", patterns_to_remove); // find out status of packages list<map<string,any> > packages = Pkg::ResolvableProperties ("", `package, ""); packages = filter (map<string,any> p, packages, { - return p["status"]:nil == `selected || p["status"]:nil == `removed; - }); - packages = filter (map<string,any> p, packages, { return p["transact_by"]:nil == `user || p["transact_by"]:nil == `app_high; }); list<string> packages_to_remove = []; list<string> packages_to_install = maplist (map<string,any> p, packages, { - if (p["status"]:nil == `selected) + if (p["status"]:nil == `selected || p["status"]:nil == `installed) return p["name"]:""; - else + else if (p["status"]:nil == `removed || p["status"]:nil == `available) packages_to_remove = add (packages_to_remove, p["name"]:""); return nil; }); + packages_to_install = filter (string p, packages_to_install, { + return p != nil; + }); y2internal ("Packages to install: %1", packages_to_install); y2internal ("Packages to remove: %1", packages_to_remove); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62345 - /trunk/storage/storage/src/modules/Storage.ycp
by aschnell＠svn.opensuse.org 05 Aug '10

05 Aug '10

Author: aschnell Date: Thu Aug 5 11:07:32 2010 New Revision: 62345 URL: http://svn.opensuse.org/viewcvs/yast?rev=62345&view=rev Log: - removed code inserted for testing Modified: trunk/storage/storage/src/modules/Storage.ycp Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Thu Aug 5 11:07:32 2010 @@ -1203,8 +1203,7 @@ integer t = LibStorage::DiskInfo::swig_transport_get(dinfo); d["transport"] = toSymbol(conv_transport, t); - boolean bt = LibStorage::DiskInfo::swig_iscsi_get(dinfo); bt = true; - + boolean bt = LibStorage::DiskInfo::swig_iscsi_get(dinfo); if( bt ) d["iscsi"] = true; else if( haskey( d, "iscsi" )) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62344 - in /trunk/autoinstallation: package/autoyast2.changes src/modules/AutoinstStorage.ycp
by ug＠svn.opensuse.org 05 Aug '10

05 Aug '10

Author: ug Date: Thu Aug 5 10:56:14 2010 New Revision: 62344 URL: http://svn.opensuse.org/viewcvs/yast?rev=62344&view=rev Log: a new filesystem can be specified for partitioning_advanced Modified: trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/modules/AutoinstStorage.ycp Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyas… ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Thu Aug 5 10:56:14 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Aug 5 10:53:55 CEST 2010 - ug(a)suse.de + +- a new filesystem can be specified for partitioning_advanced + +------------------------------------------------------------------- Tue Aug 3 11:33:58 CEST 2010 - ug(a)suse.de - reusing more partitions than the hardware still could create Modified: trunk/autoinstallation/src/modules/AutoinstStorage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/Aut… ============================================================================== --- trunk/autoinstallation/src/modules/AutoinstStorage.ycp (original) +++ trunk/autoinstallation/src/modules/AutoinstStorage.ycp Thu Aug 5 10:56:14 2010 @@ -641,6 +641,8 @@ target_map = Storage::SetPartitionData (target_map, part, "format", p["format"]:false ); target_map = Storage::SetPartitionData (target_map, part, "delete", false); target_map = Storage::SetPartitionData (target_map, part, "create", false); + if( haskey( p, "filesystem" ) ) + target_map = Storage::SetPartitionData (target_map, part, "filesystem", p["filesystem"]:`ext4); if( size(mount_options) > 0 && !haskey(p, "fstopt" ) ) target_map = Storage::SetPartitionData (target_map, part, "fstopt", mount_options); if( haskey(p, "fstopt" ) ) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62343 - /trunk/storage/storage/src/include/ep-hd.ycp
by aschnell＠svn.opensuse.org 04 Aug '10

04 Aug '10

Author: aschnell Date: Wed Aug 4 18:52:20 2010 New Revision: 62343 URL: http://svn.opensuse.org/viewcvs/yast?rev=62343&view=rev Log: - show fibre channel data only for fibre channel disks Modified: trunk/storage/storage/src/include/ep-hd.ycp Modified: trunk/storage/storage/src/include/ep-hd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-h… ============================================================================== --- trunk/storage/storage/src/include/ep-hd.ycp (original) +++ trunk/storage/storage/src/include/ep-hd.ycp Wed Aug 4 18:52:20 2010 @@ -209,11 +209,13 @@ fields = (list<symbol>) merge(fields, [ `heading_md, `raid_type, `chunk_size, `parity_algorithm ]); } - if (contains([ `CT_DISK ], ctype)) + if (contains([ `CT_DISK ], ctype) && target_map[device, "transport"]:`unknown == `fc) { fields = (list<symbol>) merge(fields, [`heading_fc, `fc_wwpn, `fc_port_id, `fc_fcp_lun ]); } + fields = StorageSettings::FilterOverview(fields); + term buttons = `HBox(); if ((integer) SCR::Read(.target.size, "/usr/sbin/smartctl") > 0) @@ -227,7 +229,7 @@ UI::ReplaceWidget(`tab_panel, `VBox( `HStretch(), - StorageFields::Overview(StorageSettings::FilterOverview(fields), target_map, device), + StorageFields::Overview(fields, target_map, device), add(buttons, `HStretch()) ) ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62342 - in /trunk/storage/storage/src/modules: Storage.ycp StorageFields.ycp
by aschnell＠svn.opensuse.org 04 Aug '10

04 Aug '10

Author: aschnell Date: Wed Aug 4 15:39:22 2010 New Revision: 62342 URL: http://svn.opensuse.org/viewcvs/yast?rev=62342&view=rev Log: - display transport type as bus Modified: trunk/storage/storage/src/modules/Storage.ycp trunk/storage/storage/src/modules/StorageFields.ycp Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Wed Aug 4 15:39:22 2010 @@ -217,6 +217,20 @@ ] ]; +map<string,any> conv_transport = + $[ "def_sym" : `unknown, + "def_int" : LibStorage::TUNKNOWN(), + "m" : $[ LibStorage::SBP() : `sbp, + LibStorage::ATA() : `ata, + LibStorage::FC() : `fc, + LibStorage::ISCSI() : `iscsi, + LibStorage::SAS() : `sas, + LibStorage::SATA() : `sata, + LibStorage::SPI() : `spi, + LibStorage::USB() : `usb + ] + ]; + map DiskMapVersion = $[]; map DiskMap = $[]; @@ -1185,7 +1199,12 @@ d["label"] = LibStorage::DiskInfo::swig_disklabel_get(dinfo); d["max_logical"] = LibStorage::DiskInfo::swig_maxLogical_get(dinfo); d["max_primary"] = LibStorage::DiskInfo::swig_maxPrimary_get(dinfo); - boolean bt = LibStorage::DiskInfo::swig_iscsi_get(dinfo); + + integer t = LibStorage::DiskInfo::swig_transport_get(dinfo); + d["transport"] = toSymbol(conv_transport, t); + + boolean bt = LibStorage::DiskInfo::swig_iscsi_get(dinfo); bt = true; + if( bt ) d["iscsi"] = true; else if( haskey( d, "iscsi" )) @@ -1639,7 +1658,7 @@ map toDiskMap( map disk, map cinfo ) { list<string> l = [ "size_k", "cyl_size", "cyl_count", "sector_size", "label", "name", "device", - "max_logical", "max_primary", "type", "readonly", + "max_logical", "max_primary", "type", "readonly", "transport", "iscsi", "used_by", "used_by_type", "used_by_device", "partitions", "dasdfmt", "udev_id", "udev_path" ]; foreach( string s, l, Modified: trunk/storage/storage/src/modules/StorageFields.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/StorageFields.ycp (original) +++ trunk/storage/storage/src/modules/StorageFields.ycp Wed Aug 4 15:39:22 2010 @@ -733,7 +733,10 @@ case `bus: { - string value = data["bus"]:""; + map<symbol, string> names = $[ `sbp : "Firewire", `ata : "ATA", + `fc : "Fibre Channel", `iscsi : "iSCSI", `sas : "SAS", + `sata : "SATA", `spi : "SCSI", `usb : "USB" ]; + string value = names[data["transport"]:`unknown]:""; if (style == `table) return value; else -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62341 - /trunk/storage/storage/src/include/auto_part_prepare.ycp
by aschnell＠svn.opensuse.org 04 Aug '10

04 Aug '10

Author: aschnell Date: Wed Aug 4 15:38:18 2010 New Revision: 62341 URL: http://svn.opensuse.org/viewcvs/yast?rev=62341&view=rev Log: - use newer function Modified: trunk/storage/storage/src/include/auto_part_prepare.ycp Modified: trunk/storage/storage/src/include/auto_part_prepare.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/auto… ============================================================================== --- trunk/storage/storage/src/include/auto_part_prepare.ycp (original) +++ trunk/storage/storage/src/include/auto_part_prepare.ycp Wed Aug 4 15:38:18 2010 @@ -26,7 +26,7 @@ y2milestone( "prepare_partitions bytes_per_unit: %1 disk_size:%2", bytes_per_unit, disk_size ); - integer size_of_boot = Partitions::MinimalNeededBootsize(); + integer size_of_boot = Partitions::ProposedBootsize(); integer size_of_swap = 1024 * 1024 * Partitions::SwapSizeMb(0); // The minimum size needed to install a default system -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62340 - /tags/branch-Linux-11_3-2_19_2/add-on-creator/
by jsuchome＠svn.opensuse.org 04 Aug '10

04 Aug '10

Author: jsuchome Date: Wed Aug 4 15:04:49 2010 New Revision: 62340 URL: http://svn.opensuse.org/viewcvs/yast?rev=62340&view=rev Log: Created tag branch-Linux-11_3-2_19_2 for add-on-creator Added: tags/branch-Linux-11_3-2_19_2/add-on-creator/ - copied from r62339, branches/SuSE-Linux-11_3-Branch/add-on-creator/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62339 - in /branches/SuSE-Linux-11_3-Branch/add-on-creator: VERSION package/yast2-add-on-creator.changes src/AddOnCreator.ycp
by jsuchome＠svn.opensuse.org 04 Aug '10

04 Aug '10

Author: jsuchome Date: Wed Aug 4 15:04:41 2010 New Revision: 62339 URL: http://svn.opensuse.org/viewcvs/yast?rev=62339&view=rev Log: - cleanup the preparation directory for building iso image (bnc#623036) - 2.19.2 Modified: branches/SuSE-Linux-11_3-Branch/add-on-creator/VERSION branches/SuSE-Linux-11_3-Branch/add-on-creator/package/yast2-add-on-creator.changes branches/SuSE-Linux-11_3-Branch/add-on-creator/src/AddOnCreator.ycp Modified: branches/SuSE-Linux-11_3-Branch/add-on-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/add-on… ============================================================================== --- branches/SuSE-Linux-11_3-Branch/add-on-creator/VERSION (original) +++ branches/SuSE-Linux-11_3-Branch/add-on-creator/VERSION Wed Aug 4 15:04:41 2010 @@ -1 +1 @@ -2.19.1 +2.19.2 Modified: branches/SuSE-Linux-11_3-Branch/add-on-creator/package/yast2-add-on-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/add-on… ============================================================================== --- branches/SuSE-Linux-11_3-Branch/add-on-creator/package/yast2-add-on-creator.changes (original) +++ branches/SuSE-Linux-11_3-Branch/add-on-creator/package/yast2-add-on-creator.changes Wed Aug 4 15:04:41 2010 @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Jul 27 13:48:15 CEST 2010 - jsuchome(a)suse.cz + +- cleanup the preparation directory for building iso image + (bnc#623036) +- 2.19.2 + ------------------------------------------------------------------ Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz Modified: branches/SuSE-Linux-11_3-Branch/add-on-creator/src/AddOnCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/add-on… ============================================================================== --- branches/SuSE-Linux-11_3-Branch/add-on-creator/src/AddOnCreator.ycp (original) +++ branches/SuSE-Linux-11_3-Branch/add-on-creator/src/AddOnCreator.ycp Wed Aug 4 15:04:41 2010 @@ -3088,6 +3088,8 @@ Progress::NextStage(); + // when building ISO, target directory is defined by iso_path: + // let's use base_output_path for gathering data needed for iso creation if (current_product["iso"]:false) { string iso_path = current_product["iso_path"]:""; @@ -3097,6 +3099,10 @@ if (!only_sign_product) { base_output_path= tmpdir + "/output"; + if (FileUtils::Exists (base_output_path)) + { + SCR::Execute (.target.bash, sformat ("/bin/rm -rf '%1'", base_output_path)); + } SCR::Execute (.target.mkdir, base_output_path); } } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62338 - /tags/branch-Linux-11_2-2_18_9/add-on-creator/
by jsuchome＠svn.opensuse.org 04 Aug '10

04 Aug '10

Author: jsuchome Date: Wed Aug 4 15:04:39 2010 New Revision: 62338 URL: http://svn.opensuse.org/viewcvs/yast?rev=62338&view=rev Log: Created tag branch-Linux-11_2-2_18_9 for add-on-creator Added: tags/branch-Linux-11_2-2_18_9/add-on-creator/ - copied from r62337, branches/SuSE-Linux-11_2-Branch/add-on-creator/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62337 - /tags/branch-Linux-11_2-2_18_9/
by jsuchome＠svn.opensuse.org 04 Aug '10

04 Aug '10

Author: jsuchome Date: Wed Aug 4 15:04:35 2010 New Revision: 62337 URL: http://svn.opensuse.org/viewcvs/yast?rev=62337&view=rev Log: Created tag branch-Linux-11_2-2_18_9 Added: tags/branch-Linux-11_2-2_18_9/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62336 - in /branches/SuSE-Linux-11_2-Branch/add-on-creator: VERSION package/yast2-add-on-creator.changes src/AddOnCreator.ycp
by jsuchome＠svn.opensuse.org 04 Aug '10

04 Aug '10

Author: jsuchome Date: Wed Aug 4 15:04:24 2010 New Revision: 62336 URL: http://svn.opensuse.org/viewcvs/yast?rev=62336&view=rev Log: - cleanup the preparation directory for building iso image (bnc#623036) - 2.18.9 Modified: branches/SuSE-Linux-11_2-Branch/add-on-creator/VERSION branches/SuSE-Linux-11_2-Branch/add-on-creator/package/yast2-add-on-creator.changes branches/SuSE-Linux-11_2-Branch/add-on-creator/src/AddOnCreator.ycp Modified: branches/SuSE-Linux-11_2-Branch/add-on-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_2-Branch/add-on… ============================================================================== --- branches/SuSE-Linux-11_2-Branch/add-on-creator/VERSION (original) +++ branches/SuSE-Linux-11_2-Branch/add-on-creator/VERSION Wed Aug 4 15:04:24 2010 @@ -1 +1 @@ -2.18.8 +2.18.9 Modified: branches/SuSE-Linux-11_2-Branch/add-on-creator/package/yast2-add-on-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_2-Branch/add-on… ============================================================================== --- branches/SuSE-Linux-11_2-Branch/add-on-creator/package/yast2-add-on-creator.changes (original) +++ branches/SuSE-Linux-11_2-Branch/add-on-creator/package/yast2-add-on-creator.changes Wed Aug 4 15:04:24 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Aug 4 14:55:45 CEST 2010 - jsuchome(a)suse.cz + +- cleanup the preparation directory for building iso image + (bnc#623036) +- 2.18.9 + +------------------------------------------------------------------- Wed Oct 21 09:03:39 CEST 2009 - jsuchome(a)suse.cz - fixed importing product file (bnc#548637) Modified: branches/SuSE-Linux-11_2-Branch/add-on-creator/src/AddOnCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_2-Branch/add-on… ============================================================================== --- branches/SuSE-Linux-11_2-Branch/add-on-creator/src/AddOnCreator.ycp (original) +++ branches/SuSE-Linux-11_2-Branch/add-on-creator/src/AddOnCreator.ycp Wed Aug 4 15:04:24 2010 @@ -3081,6 +3081,8 @@ Progress::NextStage(); + // when building ISO, target directory is defined by iso_path: + // let's use base_output_path for gathering data needed for iso creation if (current_product["iso"]:false) { string iso_path = current_product["iso_path"]:""; @@ -3090,6 +3092,10 @@ if (!only_sign_product) { base_output_path= tmpdir + "/output"; + if (FileUtils::Exists (base_output_path)) + { + SCR::Execute (.target.bash, sformat ("/bin/rm -rf '%1'", base_output_path)); + } SCR::Execute (.target.mkdir, base_output_path); } } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62335 - in /trunk/printer: VERSION src/helps.ycp src/printingvianetwork.ycp src/sharing.ycp
by jsmeix＠svn.opensuse.org 04 Aug '10

04 Aug '10

Author: jsmeix Date: Wed Aug 4 15:03:25 2010 New Revision: 62335 URL: http://svn.opensuse.org/viewcvs/yast?rev=62335&view=rev Log: - Enhanced texts in popups regarding firewall so that they can no longer be misunderstood to open ports (bnc#627799). - Enhanced the help text regarding possible drawback (delays if CUPS server does not respond) for a "client only" config. - Because openSUSE 11.3 is done, increased VERSION to 2.20.0. Modified: trunk/printer/VERSION trunk/printer/src/helps.ycp trunk/printer/src/printingvianetwork.ycp trunk/printer/src/sharing.ycp Modified: trunk/printer/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/VERSION?rev=62335&r1=623… ============================================================================== --- trunk/printer/VERSION (original) +++ trunk/printer/VERSION Wed Aug 4 15:03:25 2010 @@ -1 +1 @@ -2.19.14 +2.20.0 Modified: trunk/printer/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/helps.ycp?rev=62335&… ============================================================================== --- trunk/printer/src/helps.ycp (original) +++ trunk/printer/src/helps.ycp Wed Aug 4 15:03:25 2010 @@ -692,7 +692,13 @@ _(" If you print only via network and if you use only one single CUPS server, there is no need to use CUPS Browsing and have a CUPS daemon running on your host. -Instead it is simpler to specify the CUPS server and access it directly. +Instead it is simpler to specify the CUPS server and access it directly. +A possible drawback is that application programs may be delayed +for some time (until a timeout happens) when they try +to access the CUPS server but it is actually not available +(e.g. while traveling with a laptop). Usually it is a host name +resolution (DNS) timeout which causes the delay so that it may help +to have a hardcoded entry for the CUPS server in the /etc/hosts file. ") + // PrintingViaNetworkDialog help 4/4: _(" Modified: trunk/printer/src/printingvianetwork.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/printingvianetwork.y… ============================================================================== --- trunk/printer/src/printingvianetwork.ycp (original) +++ trunk/printer/src/printingvianetwork.ycp Wed Aug 4 15:03:25 2010 @@ -183,11 +183,13 @@ boolean ShowBrowsingFirewallPopup() { if( Printerlib::FirewallSeemsToBeActive() ) - { Popup::MessageDetails( // Popup::MessageDetails message: - _("Check that your firewall allows incomming printer information on UDP port 631."), - // Popup::MessageDetails information regarding details: - _("For details regarding firewall see the help text of this dialog.") - ); + { Popup::AnyMessage( // Popup::AnyMessage header: + // Use the exact same wording "printer announcements from CUPS servers" + // as in the matching CheckBox to accept printer information from remote CUPS servers: + _("A firewall may reject printer announcements from CUPS servers"), + // Popup::AnyMessage message: + _("Regarding firewall setup see the help text of this dialog.") + ); return true; } return false; Modified: trunk/printer/src/sharing.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/sharing.ycp?rev=6233… ============================================================================== --- trunk/printer/src/sharing.ycp (original) +++ trunk/printer/src/sharing.ycp Wed Aug 4 15:03:25 2010 @@ -233,11 +233,13 @@ boolean ShowSharePrintersFirewallPopup() { if( Printerlib::FirewallSeemsToBeActive() ) - { Popup::MessageDetails( // Popup::MessageDetails message: - _("Check that your firewall allows remote access to CUPS via IPP on port 631."), - // Popup::MessageDetails information regarding details: - _("For details regarding firewall see the help text of this dialog.") - ); + { Popup::AnyMessage( // Popup::AnyMessage header: + // Use the exact same wording "remote access" + // as in the matching RadioButton label to allow remote access to local print queues: + _("A firewall may prevent remote access"), + // Popup::AnyMessage message: + _("Regarding firewall setup see the help text of this dialog.") + ); return true; } return false; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62334 - /tags/stable-2_19_18/country/
by jsuchome＠svn.opensuse.org 03 Aug '10

03 Aug '10

Author: jsuchome Date: Tue Aug 3 15:27:36 2010 New Revision: 62334 URL: http://svn.opensuse.org/viewcvs/yast?rev=62334&view=rev Log: Created tag stable-2_19_18 for country Added: tags/stable-2_19_18/country/ - copied from r62333, trunk/country/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62333 - in /trunk/country: VERSION package/yast2-country.changes timezone/src/dialogs.ycp
by jsuchome＠svn.opensuse.org 03 Aug '10

03 Aug '10

Author: jsuchome Date: Tue Aug 3 15:27:30 2010 New Revision: 62333 URL: http://svn.opensuse.org/viewcvs/yast?rev=62333&view=rev Log: - in text mode, set the timezone when leaving dialog (bnc#617861) - 2.19.18 Modified: trunk/country/VERSION trunk/country/package/yast2-country.changes trunk/country/timezone/src/dialogs.ycp Modified: trunk/country/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/VERSION?rev=62333&r1=623… ============================================================================== --- trunk/country/VERSION (original) +++ trunk/country/VERSION Tue Aug 3 15:27:30 2010 @@ -1 +1 @@ -2.19.17 +2.19.18 Modified: trunk/country/package/yast2-country.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/package/yast2-country.ch… ============================================================================== --- trunk/country/package/yast2-country.changes (original) +++ trunk/country/package/yast2-country.changes Tue Aug 3 15:27:30 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Aug 3 15:26:11 CEST 2010 - jsuchome(a)suse.cz + +- in text mode, set the timezone when leaving dialog (bnc#617861) +- 2.19.18 + +------------------------------------------------------------------- Fri Jun 25 10:47:20 CEST 2010 - jsuchome(a)suse.cz - Console.ycp: correct parsing of the kernel line (bnc#604699) Modified: trunk/country/timezone/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/timezone/src/dialogs.ycp… ============================================================================== --- trunk/country/timezone/src/dialogs.ycp (original) +++ trunk/country/timezone/src/dialogs.ycp Tue Aug 3 15:27:30 2010 @@ -766,6 +766,19 @@ } else if (ret == `settime) { + // timezone was not adapted in ncurses (bnc#617861) + if (textmode) + { + string tz = selected_timezone (); + if (tz != timezone) + { + timezone = tz; + if (timezone != timezone_old) + changed_time = true; + timezone_old = timezone; + SetTimezone (hwclock_s, timezone, false, changed_time); + } + } if (SetTimeDialog()) { Timezone::diff = 0; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62332 - in /trunk/storage: package/ storage/src/modules/ storage/src/testsuite/tests/
by aschnell＠svn.opensuse.org 03 Aug '10

03 Aug '10

Author: aschnell Date: Tue Aug 3 12:58:13 2010 New Revision: 62332 URL: http://svn.opensuse.org/viewcvs/yast?rev=62332&view=rev Log: - increased proposed size for /boot to 150 MB (bnc #627288) Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/modules/Partitions.ycp trunk/storage/storage/src/testsuite/tests/empty-efi1.out trunk/storage/storage/src/testsuite/tests/empty-efi2.out trunk/storage/storage/src/testsuite/tests/empty3.out trunk/storage/storage/src/testsuite/tests/empty4.out trunk/storage/storage/src/testsuite/tests/empty5.out trunk/storage/storage/src/testsuite/tests/empty6.out Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Tue Aug 3 12:58:13 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Aug 03 12:45:44 CEST 2010 - aschnell(a)suse.de + +- increased proposed size for /boot to 150 MB (bnc #627288) + +------------------------------------------------------------------- Thu Jul 29 15:53:11 CEST 2010 - fehr(a)suse.de - fix bug that destroys encrypted volumes when wron password is Modified: trunk/storage/storage/src/modules/Partitions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Part… ============================================================================== --- trunk/storage/storage/src/modules/Partitions.ycp (original) +++ trunk/storage/storage/src/modules/Partitions.ycp Tue Aug 3 12:58:13 2010 @@ -163,7 +163,7 @@ { if (isempty(boot_size_k)) { - boot_size_k = $[ `proposed : 64 * 1024, + boot_size_k = $[ `proposed : 150 * 1024, `minimal : 64 * 1024, `maximal : 750 * 1024 ]; Modified: trunk/storage/storage/src/testsuite/tests/empty-efi1.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/te… ============================================================================== --- trunk/storage/storage/src/testsuite/tests/empty-efi1.out (original) +++ trunk/storage/storage/src/testsuite/tests/empty-efi1.out Tue Aug 3 12:58:13 2010 @@ -1,4 +1,4 @@ Dump Proposal: -Dump Create boot volume /dev/sda1 (70.60 MB) with vfat +Dump Create boot volume /dev/sda1 (156.88 MB) with vfat Dump Create swap volume /dev/sda2 (517.72 MB) -Dump Create root volume /dev/sda3 (297.51 GB) with ext4 +Dump Create root volume /dev/sda3 (297.43 GB) with ext4 Modified: trunk/storage/storage/src/testsuite/tests/empty-efi2.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/te… ============================================================================== --- trunk/storage/storage/src/testsuite/tests/empty-efi2.out (original) +++ trunk/storage/storage/src/testsuite/tests/empty-efi2.out Tue Aug 3 12:58:13 2010 @@ -1,5 +1,5 @@ Dump Proposal: -Dump Create boot volume /dev/sda1 (70.60 MB) with vfat +Dump Create boot volume /dev/sda1 (156.88 MB) with vfat Dump Create swap volume /dev/sda2 (2.01 GB) Dump Create root volume /dev/sda3 (20.00 GB) with ext4 -Dump Create volume /dev/sda4 (276.01 GB) for /home with ext4 +Dump Create volume /dev/sda4 (275.93 GB) for /home with ext4 Modified: trunk/storage/storage/src/testsuite/tests/empty3.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/te… ============================================================================== --- trunk/storage/storage/src/testsuite/tests/empty3.out (original) +++ trunk/storage/storage/src/testsuite/tests/empty3.out Tue Aug 3 12:58:13 2010 @@ -1,6 +1,6 @@ Dump Proposal: -Dump Create boot volume /dev/sda1 (70.60 MB) with ext4 -Dump Create volume /dev/sda2 (29.99 GB) -Dump Create volume group system (29.99 GB) from /dev/sda2 [destructive] +Dump Create boot volume /dev/sda1 (156.88 MB) with ext4 +Dump Create volume /dev/sda2 (29.98 GB) +Dump Create volume group system (29.98 GB) from /dev/sda2 [destructive] Dump Create logical volume /dev/system/root (10.00 GB) for / with ext4 Dump Create swap logical volume /dev/system/swap (512.00 MB) Modified: trunk/storage/storage/src/testsuite/tests/empty4.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/te… ============================================================================== --- trunk/storage/storage/src/testsuite/tests/empty4.out (original) +++ trunk/storage/storage/src/testsuite/tests/empty4.out Tue Aug 3 12:58:13 2010 @@ -1,7 +1,7 @@ Dump Proposal: -Dump Create boot volume /dev/sda1 (70.60 MB) with ext4 -Dump Create volume /dev/sda2 (29.99 GB) -Dump Create volume group system (29.99 GB) from /dev/sda2 [destructive] -Dump Create logical volume /dev/system/home (19.49 GB) for /home with ext4 +Dump Create boot volume /dev/sda1 (156.88 MB) with ext4 +Dump Create volume /dev/sda2 (29.98 GB) +Dump Create volume group system (29.98 GB) from /dev/sda2 [destructive] +Dump Create logical volume /dev/system/home (19.48 GB) for /home with ext4 Dump Create logical volume /dev/system/root (10.00 GB) for / with ext4 Dump Create swap logical volume /dev/system/swap (512.00 MB) Modified: trunk/storage/storage/src/testsuite/tests/empty5.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/te… ============================================================================== --- trunk/storage/storage/src/testsuite/tests/empty5.out (original) +++ trunk/storage/storage/src/testsuite/tests/empty5.out Tue Aug 3 12:58:13 2010 @@ -1,6 +1,6 @@ Dump Proposal: -Dump Create boot volume /dev/sda1 (70.60 MB) with ext4 -Dump Create volume /dev/sda2 (298.02 GB) -Dump Create volume group system (298.02 GB) from /dev/sda2 [destructive] +Dump Create boot volume /dev/sda1 (156.88 MB) with ext4 +Dump Create volume /dev/sda2 (297.94 GB) +Dump Create volume group system (297.93 GB) from /dev/sda2 [destructive] Dump Create logical volume /dev/system/root (10.00 GB) for / with ext4 Dump Create swap logical volume /dev/system/swap (768.00 MB) Modified: trunk/storage/storage/src/testsuite/tests/empty6.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/te… ============================================================================== --- trunk/storage/storage/src/testsuite/tests/empty6.out (original) +++ trunk/storage/storage/src/testsuite/tests/empty6.out Tue Aug 3 12:58:13 2010 @@ -1,7 +1,7 @@ Dump Proposal: -Dump Create boot volume /dev/sda1 (70.60 MB) with ext4 -Dump Create volume /dev/sda2 (298.02 GB) -Dump Create volume group system (298.02 GB) from /dev/sda2 [destructive] +Dump Create boot volume /dev/sda1 (156.88 MB) with ext4 +Dump Create volume /dev/sda2 (297.94 GB) +Dump Create volume group system (297.93 GB) from /dev/sda2 [destructive] Dump Create logical volume /dev/system/home (25.00 GB) for /home with ext4 Dump Create logical volume /dev/system/root (10.00 GB) for / with ext4 Dump Create swap logical volume /dev/system/swap (768.00 MB) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62331 - in /trunk/storage/storage/src/modules: Partitions.ycp StorageProposal.ycp
by aschnell＠svn.opensuse.org 03 Aug '10

03 Aug '10

Author: aschnell Date: Tue Aug 3 12:45:11 2010 New Revision: 62331 URL: http://svn.opensuse.org/viewcvs/yast?rev=62331&view=rev Log: - added function BootSizeK() that returns proposed, minimal and maximal size for boot Modified: trunk/storage/storage/src/modules/Partitions.ycp trunk/storage/storage/src/modules/StorageProposal.ycp Modified: trunk/storage/storage/src/modules/Partitions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Part… ============================================================================== --- trunk/storage/storage/src/modules/Partitions.ycp (original) +++ trunk/storage/storage/src/modules/Partitions.ycp Tue Aug 3 12:45:11 2010 @@ -83,8 +83,7 @@ global const list<integer> no_windows = [ 0x12, 0x82, 0xde, fsid_gpt_boot, fsid_gpt_service, fsid_gpt_msftres ]; - - integer minimal_needed_bootsize = 0; + map<symbol, integer> boot_size_k = $[]; symbol default_fs = `unknown; symbol default_boot_fs = `unknown; @@ -160,48 +159,58 @@ } -global define integer MinimalNeededBootsize() - ``{ - if( minimal_needed_bootsize == 0 ) +map<symbol, integer> BootSizeK() +{ + if (isempty(boot_size_k)) + { + boot_size_k = $[ `proposed : 64 * 1024, + `minimal : 64 * 1024, + `maximal : 750 * 1024 ]; + + if (Arch::ia64()) { - minimal_needed_bootsize = 64 * 1024 * 1024; - if( Arch::ia64() ) - { - minimal_needed_bootsize = 200*1024*1024; - } - else if( Arch::board_chrp() ) - { - minimal_needed_bootsize = 200*1024*1024; - } - else if( Arch::board_prep() ) - { - minimal_needed_bootsize = 200*1024*1024; - } - else if( Arch::board_iseries() ) - { - minimal_needed_bootsize = 200*1024*1024; - } - else if( Arch::board_mac() ) - { - minimal_needed_bootsize = 32*1024*1024; - } + boot_size_k[`proposed] = 200 * 1024; + boot_size_k[`minimal] = 180 * 1024; + } + else if (Arch::board_chrp() || Arch::board_prep() || Arch::board_iseries()) + { + boot_size_k[`proposed] = 200 * 1024; + boot_size_k[`minimal] = 180 * 1024; + } + else if (Arch::board_mac()) + { + boot_size_k[`proposed] = 32 * 1024; + boot_size_k[`minimal] = 800; } - return( minimal_needed_bootsize ); - } -global define integer MinimalRequiredBootsize() - ``{ - integer need = MinimalNeededBootsize(); - integer ret = need; - if( Arch::ia64() ) - ret = ret / 10 * 9; - else if( Arch::board_mac() ) - ret = 800 * 1024; - if( ret!=need ) - y2milestone( "MinimalRequiredBootsize ret %1 Req:%2", ret, need ); - return( ret ); + y2milestone("BootSizeK boot_size_k:%1", boot_size_k); } + return boot_size_k; +} + + +global integer MinimalNeededBootsize() +{ + return 1024 * BootSizeK()[`proposed]:0; +} + +global integer ProposedBootsize() +{ + return 1024 * BootSizeK()[`proposed]:0; +} + +global integer MinimalBootsize() +{ + return 1024 * BootSizeK()[`minimal]:0; +} + +global integer MaximalBootsize() +{ + return 1024 * BootSizeK()[`maximal]:0; +} + + global define integer BootCyl() ``{ if( boot_cyl == 0 ) Modified: trunk/storage/storage/src/modules/StorageProposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/StorageProposal.ycp (original) +++ trunk/storage/storage/src/modules/StorageProposal.ycp Tue Aug 3 12:45:11 2010 @@ -419,13 +419,13 @@ { map pb = $[]; pb["mount"] = Partitions::BootMount(); - pb["size"] = Partitions::MinimalNeededBootsize(); + pb["size"] = Partitions::ProposedBootsize(); pb["fsys"] = Partitions::DefaultBootFs(); pb["id"] = Partitions::FsidBoot(); pb["auto_added"] = true; pb["max_cyl"] = Partitions::BootCyl(); pb["primary"] = Partitions::BootPrimary(); - pb["maxsize"] = 500*1024*1024; + pb["maxsize"] = Partitions::MaximalBootsize(); tc["partitions"] = add( tc["partitions"]:[], pb ); y2milestone( "try_add_boot disk_cyl %1 boot_cyl %2 need_boot %3 typ %4", disk["cyl_count"]:0, Partitions::BootCyl(), @@ -2179,7 +2179,7 @@ { if( partition["size"]:0 == -1 ) { - partition["size"] = Partitions::MinimalNeededBootsize(); + partition["size"] = Partitions::ProposedBootsize(); } if( partition["fsys"]:`none == `none ) { @@ -2398,7 +2398,7 @@ { if( part["size"]:0 == -1 ) { - part["size"] = Partitions::MinimalNeededBootsize(); + part["size"] = Partitions::ProposedBootsize(); } if( part["fsys"]:`none == `none ) { @@ -2513,11 +2513,11 @@ pl = filter( map p, partitions, ``(!p["delete"]:false && p["size_k"]:0*1024 >= - Partitions::MinimalRequiredBootsize())); + Partitions::MinimalBootsize())); map boot = find( map p, pl, ``((p["fsid"]:0 == Partitions::fsid_gpt_boot) || (p["fsid"]:0 == Partitions::FsidBoot() && - p["size_k"]:0<500*1024)|| + p["size_k"]:0*1024 <= Partitions::MaximalBootsize()) || (p["detected_fs"]:`unknown==`hfs && p["boot"]:false && label=="mac") || (p["fsid"]:0 == Partitions::fsid_prep_chrp_boot && @@ -2764,7 +2764,7 @@ if( contains( linux_pid, p["fsid"]:0 ) || (p["fsid"]:0 == Partitions::fsid_gpt_boot) || (p["fsid"]:0 == Partitions::FsidBoot() && - p["size_k"]:0<500*1024)|| + p["size_k"]:0*1024 <= Partitions::MaximalBootsize()) || (Partitions::PrepBoot() && (p["fsid"]:0 == Partitions::fsid_prep_chrp_boot|| p["fsid"]:0 == 0x06))) @@ -3690,7 +3690,7 @@ target = AddWinInfo(target); ret["target"] = target; map boot = $[ "mount" : Partitions::BootMount(), - "size" : Partitions::MinimalNeededBootsize(), + "size" : Partitions::ProposedBootsize(), "fsys" : Partitions::DefaultBootFs(), "id" : Partitions::FsidBoot(), "max_cyl" : Partitions::BootCyl() ]; @@ -3942,7 +3942,7 @@ target = remove_vm(target,key); ret["target"] = target; map boot = $[ "mount" : Partitions::BootMount(), - "size" : Partitions::MinimalNeededBootsize(), + "size" : Partitions::ProposedBootsize(), "fsys" : Partitions::DefaultBootFs(), "id" : Partitions::FsidBoot(), "max_cyl" : Partitions::BootCyl() ]; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62330 - in /trunk/autoinstallation: package/autoyast2.changes src/include/autopart.ycp
by ug＠svn.opensuse.org 03 Aug '10

03 Aug '10

Author: ug Date: Tue Aug 3 11:35:35 2010 New Revision: 62330 URL: http://svn.opensuse.org/viewcvs/yast?rev=62330&view=rev Log: reusing more partitions than the hardware still could create fails (bnc#620212) Modified: trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/include/autopart.ycp Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyas… ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Tue Aug 3 11:35:35 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Aug 3 11:33:58 CEST 2010 - ug(a)suse.de + +- reusing more partitions than the hardware still could create + fails (bnc#620212). This is a different issue but the same bug + like on Jul 15 14:21:41 below + +------------------------------------------------------------------- Thu Jul 15 14:21:41 CEST 2010 - ug(a)suse.de - speed up partitioning calculation if a lot partitions are Modified: trunk/autoinstallation/src/include/autopart.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/include/aut… ============================================================================== --- trunk/autoinstallation/src/include/autopart.ycp (original) +++ trunk/autoinstallation/src/include/autopart.ycp Tue Aug 3 11:35:35 2010 @@ -811,12 +811,18 @@ * extended is not possible and number of requested partitions is less than all * available primaries and logical slots ) */ + +/* + // FIXME: bnc#620212 - this test is buggy. Reusing more partitions than the hardware still could create will fail + // should be size(ps)-NUM_OF_REUSED if( size(g["gap"]:[])>0 && ((g["extended_possible"]:false && // size(g["free_pnr"]:[])>0 && // reusing all 4 primaries will fail with this size(ps)+1 <= size(g["ext_pnr"]:[])+size(g["free_pnr"]:[])) || (!g["extended_possible"]:false && size(ps) <= size(g["ext_pnr"]:[])+size(g["free_pnr"]:[]))) ) +*/ + if( size(g["gap"]:[])>0 ) { map lg = (map) eval(g); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62329 - /tags/stable-2_19_2/add-on-creator/
by jsuchome＠svn.opensuse.org 02 Aug '10

02 Aug '10

Author: jsuchome Date: Mon Aug 2 15:07:17 2010 New Revision: 62329 URL: http://svn.opensuse.org/viewcvs/yast?rev=62329&view=rev Log: Created tag stable-2_19_2 for add-on-creator Added: tags/stable-2_19_2/add-on-creator/ - copied from r62328, trunk/add-on-creator/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62328 - in /trunk/add-on-creator: VERSION package/yast2-add-on-creator.changes src/AddOnCreator.ycp
by jsuchome＠svn.opensuse.org 02 Aug '10

02 Aug '10

Author: jsuchome Date: Mon Aug 2 15:07:06 2010 New Revision: 62328 URL: http://svn.opensuse.org/viewcvs/yast?rev=62328&view=rev Log: - cleanup the preparation directory for building iso image (bnc#623036) - 2.19.2 Modified: trunk/add-on-creator/VERSION trunk/add-on-creator/package/yast2-add-on-creator.changes trunk/add-on-creator/src/AddOnCreator.ycp Modified: trunk/add-on-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/VERSION?rev=62328… ============================================================================== --- trunk/add-on-creator/VERSION (original) +++ trunk/add-on-creator/VERSION Mon Aug 2 15:07:06 2010 @@ -1 +1 @@ -2.19.1 +2.19.2 Modified: trunk/add-on-creator/package/yast2-add-on-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/package/yast2-add… ============================================================================== --- trunk/add-on-creator/package/yast2-add-on-creator.changes (original) +++ trunk/add-on-creator/package/yast2-add-on-creator.changes Mon Aug 2 15:07:06 2010 @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Jul 27 13:48:15 CEST 2010 - jsuchome(a)suse.cz + +- cleanup the preparation directory for building iso image + (bnc#623036) +- 2.19.2 + ------------------------------------------------------------------ Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz Modified: trunk/add-on-creator/src/AddOnCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/src/AddOnCreator.… ============================================================================== --- trunk/add-on-creator/src/AddOnCreator.ycp (original) +++ trunk/add-on-creator/src/AddOnCreator.ycp Mon Aug 2 15:07:06 2010 @@ -3088,6 +3088,8 @@ Progress::NextStage(); + // when building ISO, target directory is defined by iso_path: + // let's use base_output_path for gathering data needed for iso creation if (current_product["iso"]:false) { string iso_path = current_product["iso_path"]:""; @@ -3097,6 +3099,10 @@ if (!only_sign_product) { base_output_path= tmpdir + "/output"; + if (FileUtils::Exists (base_output_path)) + { + SCR::Execute (.target.bash, sformat ("/bin/rm -rf '%1'", base_output_path)); + } SCR::Execute (.target.mkdir, base_output_path); } } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62327 - /tags/branch-Code-11-SP1-2_17_140/network/
by mzugec＠svn.opensuse.org 02 Aug '10

02 Aug '10

Author: mzugec Date: Mon Aug 2 14:04:09 2010 New Revision: 62327 URL: http://svn.opensuse.org/viewcvs/yast?rev=62327&view=rev Log: Created tag branch-Code-11-SP1-2_17_140 for network Added: tags/branch-Code-11-SP1-2_17_140/network/ (props changed) - copied from r62326, branches/SuSE-Code-11-SP1-Branch/network/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62326 - /tags/branch-Code-11-SP1-2_17_140/
by mzugec＠svn.opensuse.org 02 Aug '10

02 Aug '10

Author: mzugec Date: Mon Aug 2 14:04:07 2010 New Revision: 62326 URL: http://svn.opensuse.org/viewcvs/yast?rev=62326&view=rev Log: Created tag branch-Code-11-SP1-2_17_140 Added: tags/branch-Code-11-SP1-2_17_140/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r62325 - in /branches/SuSE-Code-11-SP1-Branch/network: VERSION package/yast2-network.changes src/lan/YaPI/NETWORK.pm testsuite/tests/Network_YaPI.out
by mzugec＠svn.opensuse.org 02 Aug '10

02 Aug '10

Author: mzugec Date: Mon Aug 2 14:04:00 2010 New Revision: 62325 URL: http://svn.opensuse.org/viewcvs/yast?rev=62325&view=rev Log: YaPI: static hostname with DHCP (bnc#624655) Modified: branches/SuSE-Code-11-SP1-Branch/network/VERSION branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes branches/SuSE-Code-11-SP1-Branch/network/src/lan/YaPI/NETWORK.pm branches/SuSE-Code-11-SP1-Branch/network/testsuite/tests/Network_YaPI.out Modified: branches/SuSE-Code-11-SP1-Branch/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/network/VERSION Mon Aug 2 14:04:00 2010 @@ -1 +1 @@ -2.17.139 +2.17.140 Modified: branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes Mon Aug 2 14:04:00 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Aug 2 14:01:45 CEST 2010 - mzugec(a)suse.de + +- YaPI: static hostname with DHCP (bnc#624655) +- 2.17.140 + +------------------------------------------------------------------- Mon Jul 26 14:28:35 CEST 2010 - mzugec(a)suse.de - L3: fixed cmd-line support (bnc#624246) Modified: branches/SuSE-Code-11-SP1-Branch/network/src/lan/YaPI/NETWORK.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/src/lan/YaPI/NETWORK.pm (original) +++ branches/SuSE-Code-11-SP1-Branch/network/src/lan/YaPI/NETWORK.pm Mon Aug 2 14:04:00 2010 @@ -52,7 +52,8 @@ my %ret = ('interfaces'=>\%interfaces, 'routes'=>{'default'=>{'via'=>Routing->GetGateway()}}, 'dns'=>{'nameservers'=>\@{DNS->nameservers}, 'searches'=>\@{DNS->searchlist}}, - 'hostname'=>{'name'=>Hostname->CurrentHostname, 'domain'=>Hostname->CurrentDomain} + 'hostname'=>{'name'=>Hostname->CurrentHostname, 'domain'=>Hostname->CurrentDomain, 'dhcp_hostname'=>DNS->dhcp_hostname} +# 'hostname'=>{'name'=>Hostname->CurrentHostname, 'domain'=>Hostname->CurrentDomain} ); return \%ret; } @@ -96,6 +97,7 @@ DNS->Read(); DNS->hostname($args->{'hostname'}->{'name'}); DNS->domain($args->{'hostname'}->{'domain'}); + DNS->dhcp_hostname($args->{'hostname'}->{'dhcp_hostname'}) if (defined $args->{'hostname'}->{'dhcp_hostname'}); DNS->modified(1); DNS->Write(); return $ret; Modified: branches/SuSE-Code-11-SP1-Branch/network/testsuite/tests/Network_YaPI.out URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/testsuite/tests/Network_YaPI.out (original) +++ branches/SuSE-Code-11-SP1-Branch/network/testsuite/tests/Network_YaPI.out Mon Aug 2 14:04:00 2010 @@ -33,7 +33,7 @@ Read .target.lstat "/etc/sysconfig/network/ifcfg-tr-usb" nil Execute .target.bash_output "hostname --fqdn" $["exit":0, "stdout":"laptop.suse.cz"] Execute .target.bash_output "hostname --fqdn" $["exit":0, "stdout":"laptop.suse.cz"] -Return $["dns":$["nameservers":["208.67.222.222", "208.67.220.220"], "searches":["suse.cz", "suse.de"]], "hostname":$["domain":"suse.cz", "name":"laptop"], "interfaces":$["eth0":$["bootproto":"dhcp4"], "eth1":$["bootproto":"static", "ipaddr":"1.2.3.4/24"]], "routes":$["default":$["via":"10.20.30.40"]]] +Return $["dns":$["nameservers":["208.67.222.222", "208.67.220.220"], "searches":["suse.cz", "suse.de"]], "hostname":$["dhcp_hostname":"0", "domain":"suse.cz", "name":"laptop"], "interfaces":$["eth0":$["bootproto":"dhcp4"], "eth1":$["bootproto":"static", "ipaddr":"1.2.3.4/24"]], "routes":$["default":$["via":"10.20.30.40"]]] Return $["error":"", "exit":"0"] Read .target.size "/etc/sysconfig/network/routes" 27 Read .routes [$["destination":"default", "gateway":"10.20.30.40"]] -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0