August 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r39913 - in /trunk/samba-client: VERSION package/yast2-samba-client.changes src/dialogs.ycp
by jsuchome＠svn.opensuse.org 02 Aug '07

02 Aug '07

Author: jsuchome Date: Thu Aug 2 17:46:35 2007 New Revision: 39913 URL: http://svn.opensuse.org/viewcvs/yast?rev=39913&view=rev Log: - show error popup when installation of required packages fails (#296677) - 2.15.11 Modified: trunk/samba-client/VERSION trunk/samba-client/package/yast2-samba-client.changes trunk/samba-client/src/dialogs.ycp Modified: trunk/samba-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/VERSION?rev=39913&r… ============================================================================== --- trunk/samba-client/VERSION (original) +++ trunk/samba-client/VERSION Thu Aug 2 17:46:35 2007 @@ -1 +1 @@ -2.15.10 +2.15.11 Modified: trunk/samba-client/package/yast2-samba-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/package/yast2-samba… ============================================================================== --- trunk/samba-client/package/yast2-samba-client.changes (original) +++ trunk/samba-client/package/yast2-samba-client.changes Thu Aug 2 17:46:35 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Aug 2 17:34:14 CEST 2007 - jsuchome(a)suse.cz + +- show error popup when installation of required packages fails + (#296677) +- 2.15.11 + +------------------------------------------------------------------- Thu Jul 19 11:37:36 CEST 2007 - jsuchome(a)suse.cz - do not offer disabling DHCP changes of hostname when Modified: trunk/samba-client/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/src/dialogs.ycp?rev… ============================================================================== --- trunk/samba-client/src/dialogs.ycp (original) +++ trunk/samba-client/src/dialogs.ycp Thu Aug 2 17:46:35 2007 @@ -10,16 +10,17 @@ textdomain "samba-client"; +import "Autologin"; import "Directory"; -import "Mode"; -import "Stage"; -import "Samba"; -import "SambaConfig"; import "Label"; +import "Message"; +import "Mode"; import "Package"; import "Popup"; +import "Samba"; +import "SambaConfig"; +import "Stage"; import "Wizard"; -import "Autologin"; include "samba-client/helps.ycp"; include "samba-client/routines.ycp"; @@ -402,8 +403,13 @@ packages = (list<string>)merge(packages,["krb5","krb5-client"]); } packages = Samba::UpdatedArchPackages (packages); - if (!Package::InstalledAll (packages)) - Package::InstallAll (packages); + if (!Package::InstallAll (packages)) + { + Popup::Error (Message::FailedToInstallPackages ()); + ret = `not_next; + UI::ChangeWidget(`id(`winbind), `Value, false); + continue; + } } Samba::SetMkHomeDir (use_winbind && -- 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] r39912 - in /trunk/qt: VERSION package/yast2-qt.changes src/pkg/YQPkgPatchFilterView.cc src/pkg/YQPkgPatchFilterView.h src/pkg/YQPkgPatchList.cc src/pkg/YQPkgPatchList.h
by sh-sh-sh＠svn.opensuse.org 02 Aug '07

02 Aug '07

Author: sh-sh-sh Date: Thu Aug 2 17:36:24 2007 New Revision: 39912 URL: http://svn.opensuse.org/viewcvs/yast?rev=39912&view=rev Log: Fate #302052: Restrict patches view to show only update stack patches if there are any Modified: trunk/qt/VERSION trunk/qt/package/yast2-qt.changes trunk/qt/src/pkg/YQPkgPatchFilterView.cc trunk/qt/src/pkg/YQPkgPatchFilterView.h trunk/qt/src/pkg/YQPkgPatchList.cc trunk/qt/src/pkg/YQPkgPatchList.h Modified: trunk/qt/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/VERSION?rev=39912&r1=39911&r2… ============================================================================== --- trunk/qt/VERSION (original) +++ trunk/qt/VERSION Thu Aug 2 17:36:24 2007 @@ -1 +1 @@ -2.15.7 +2.15.8 Modified: trunk/qt/package/yast2-qt.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/package/yast2-qt.changes?rev=… ============================================================================== --- trunk/qt/package/yast2-qt.changes (original) +++ trunk/qt/package/yast2-qt.changes Thu Aug 2 17:36:24 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Aug 2 17:34:26 CEST 2007 - sh(a)suse.de + +- V 2.17.8 +- Fate #302052: Restrict patches view to show only update stack + patches if there are any + +------------------------------------------------------------------- Tue Jul 24 10:59:06 CEST 2007 - sh(a)suse.de - Fixed bug #285915: Can't cancel package search Modified: trunk/qt/src/pkg/YQPkgPatchFilterView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPkgPatchFilterView.… ============================================================================== --- trunk/qt/src/pkg/YQPkgPatchFilterView.cc (original) +++ trunk/qt/src/pkg/YQPkgPatchFilterView.cc Thu Aug 2 17:36:24 2007 @@ -53,6 +53,7 @@ : QVBox( parent ) { QVBox * vbox; + _haveUpdateStackPatches = YQPkgPatchList::haveUpdateStackPatches(); _splitter = new QSplitter( QSplitter::Vertical, this ); CHECK_PTR( _splitter ); vbox = new QVBox( _splitter ); CHECK_PTR( vbox ); @@ -68,9 +69,15 @@ _patchFilter = new QComboBox( hbox ); CHECK_PTR( _patchFilter ); - _patchFilter->insertItem( _( "Installable Patches" ), 0 ); - _patchFilter->insertItem( _( "Installable and Installed Patches" ), 1 ); - _patchFilter->insertItem( _( "All Patches" ), 2 ); + int index = 0; + + if ( _haveUpdateStackPatches ) + // Translators: This is about patches that patch the update engine (libzypp, YaST) itself + _patchFilter->insertItem( _( "Update Stack Patches" ), index++ ); + + _patchFilter->insertItem( _( "Installable Patches" ), index++ ); + _patchFilter->insertItem( _( "Installable and Installed Patches" ), index++ ); + _patchFilter->insertItem( _( "All Patches" ), index++ ); _patchFilter->setCurrentItem( 0 ); _patchFilter->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) ); // hor/vert label->setBuddy( _patchFilter ); @@ -118,6 +125,7 @@ connect( _patchList, SIGNAL( statusChanged() ), this, SLOT ( updateTotalDownloadSize() ) ); + fillPatchList(); updateTotalDownloadSize(); } @@ -210,8 +218,14 @@ void YQPkgPatchFilterView::fillPatchList() { - switch ( _patchFilter->currentItem() ) + int currentIndex = _patchFilter->currentItem(); + + if ( _haveUpdateStackPatches ) + currentIndex--; + + switch ( currentIndex ) { + case -1: _patchList->setFilterCriteria( YQPkgPatchList::UpdateStackPatches ); break; case 0: _patchList->setFilterCriteria( YQPkgPatchList::RelevantPatches ); break; case 1: _patchList->setFilterCriteria( YQPkgPatchList::RelevantAndInstalledPatches ); break; case 2: _patchList->setFilterCriteria( YQPkgPatchList::AllPatches ); break; Modified: trunk/qt/src/pkg/YQPkgPatchFilterView.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPkgPatchFilterView.… ============================================================================== --- trunk/qt/src/pkg/YQPkgPatchFilterView.h (original) +++ trunk/qt/src/pkg/YQPkgPatchFilterView.h Thu Aug 2 17:36:24 2007 @@ -91,6 +91,7 @@ QLabel * _totalDownloadSize; YQPkgSelMapper _selMapper; + bool _haveUpdateStackPatches; }; Modified: trunk/qt/src/pkg/YQPkgPatchList.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPkgPatchList.cc?rev… ============================================================================== --- trunk/qt/src/pkg/YQPkgPatchList.cc (original) +++ trunk/qt/src/pkg/YQPkgPatchList.cc Thu Aug 2 17:36:24 2007 @@ -34,7 +34,8 @@ #include "YQPkgTextDialog.h" -#define VERBOSE_PATCH_LIST 1 +#define VERBOSE_PATCH_LIST 1 +#define DEBUG_SHOW_ALL_UPDATE_STACK_PATCHES 0 typedef zypp::ui::PatchContents ZyppPatchContents; @@ -72,7 +73,6 @@ this, SLOT ( filter() ) ); setSorting( categoryCol() ); - fillList(); y2debug( "Creating patch list done" ); } @@ -122,6 +122,35 @@ switch ( _filterCriteria ) { + case UpdateStackPatches: + + if ( zyppPatch->affects_pkg_manager() ) + { +#if DEBUG_SHOW_ALL_UPDATE_STACK_PATCHES + displayPatch = true; +#endif + if ( selectable->hasCandidateObj() && + selectable->candidatePoolItem().status().isNeeded() ) + { + displayPatch = true; + + y2milestone( "Found YaST patch that should be installed: %s - %s", + zyppPatch->name().c_str(), + zyppPatch->summary().c_str() ); + } + + if ( selectable->hasInstalledObj() && + selectable->installedPoolItem().status().isIncomplete() ) // patch broken? + { + displayPatch = true; + + y2warning( "Installed YaST patch is broken: %s - %s", + zyppPatch->name().c_str(), + zyppPatch->summary().c_str() ); + } + } + break; + case RelevantPatches: // needed + broken + satisfied (but not installed) if ( selectable->hasInstalledObj() ) // installed? @@ -347,6 +376,34 @@ } +bool +YQPkgPatchList::haveUpdateStackPatches() +{ + for ( ZyppPoolIterator it = zyppPatchesBegin(); + it != zyppPatchesEnd(); + ++it ) + { + ZyppSel selectable = *it; + ZyppPatch zyppPatch = tryCastToZyppPatch( selectable->theObj() ); + + if ( zyppPatch && zyppPatch->affects_pkg_manager() ) + { +#if DEBUG_SHOW_ALL_UPDATE_STACK_PATCHES + return true; +#else + if ( selectable->hasCandidateObj() && + selectable->candidatePoolItem().status().isNeeded() ) + { + return true; + } +#endif + } + } + + return false; +} + + YQPkgPatchListItem * YQPkgPatchList::selection() const { Modified: trunk/qt/src/pkg/YQPkgPatchList.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPkgPatchList.h?rev=… ============================================================================== --- trunk/qt/src/pkg/YQPkgPatchList.h (original) +++ trunk/qt/src/pkg/YQPkgPatchList.h Thu Aug 2 17:36:24 2007 @@ -67,6 +67,7 @@ enum FilterCriteria { + UpdateStackPatches, // zypp or YaST2 RelevantPatches, // needed + broken RelevantAndInstalledPatches, // needed + broken + installed AllPatches // all @@ -112,6 +113,12 @@ public: /** + * Return 'true' if there is any patch for the update stack in the pool + * that is not installed yet or that could be updated. + **/ + static bool haveUpdateStackPatches(); + + /** * Set the filter criteria for fillList(). **/ void setFilterCriteria( FilterCriteria filterCriteria ); -- 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] r39911 - /tags/stable-2_15_12/ldap-client/
by jsuchome＠svn.opensuse.org 02 Aug '07

02 Aug '07

Author: jsuchome Date: Thu Aug 2 17:34:04 2007 New Revision: 39911 URL: http://svn.opensuse.org/viewcvs/yast?rev=39911&view=rev Log: Created tag stable-2_15_12 for ldap-client Added: tags/stable-2_15_12/ldap-client/ - copied from r39910, trunk/ldap-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] r39910 - in /trunk/ldap-client: VERSION package/yast2-ldap-client.changes src/ui.ycp
by jsuchome＠svn.opensuse.org 02 Aug '07

02 Aug '07

Author: jsuchome Date: Thu Aug 2 17:33:45 2007 New Revision: 39910 URL: http://svn.opensuse.org/viewcvs/yast?rev=39910&view=rev Log: - do not reinitialize LDAP connection when not needed (#296284) - 2.15.12 Modified: trunk/ldap-client/VERSION trunk/ldap-client/package/yast2-ldap-client.changes trunk/ldap-client/src/ui.ycp Modified: trunk/ldap-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/VERSION?rev=39910&r1… ============================================================================== --- trunk/ldap-client/VERSION (original) +++ trunk/ldap-client/VERSION Thu Aug 2 17:33:45 2007 @@ -1 +1 @@ -2.15.11 +2.15.12 Modified: trunk/ldap-client/package/yast2-ldap-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/package/yast2-ldap-c… ============================================================================== --- trunk/ldap-client/package/yast2-ldap-client.changes (original) +++ trunk/ldap-client/package/yast2-ldap-client.changes Thu Aug 2 17:33:45 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Aug 2 17:24:53 CEST 2007 - jsuchome(a)suse.cz + +- do not reinitialize LDAP connection when not needed (#296284) +- 2.15.12 + +------------------------------------------------------------------- Fri Jul 27 12:01:03 CEST 2007 - jsuchome(a)suse.cz - use "files ldap" instead of "compat" for group entry in Modified: trunk/ldap-client/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/ui.ycp?rev=39910… ============================================================================== --- trunk/ldap-client/src/ui.ycp (original) +++ trunk/ldap-client/src/ui.ycp Thu Aug 2 17:33:45 2007 @@ -635,7 +635,7 @@ if (base_dn == "") return; - if ((boolean)SCR::Execute (.ldap, $[ + if (Ldap::ldap_initialized || (boolean)SCR::Execute (.ldap, $[ "hostname" : Ldap::GetFirstServer (Ldap::server), "port" : Ldap::GetFirstPort (Ldap::server), "version" : Ldap::ldap_v2 ? 2 : 3, @@ -1493,9 +1493,13 @@ `HBox ( `ReplacePoint (`id(`rp_modnames), `Empty()), `VBox ( - `Label (""), `PushButton (`id (`new), Label::NewButton())), + `Label (""), + `PushButton (`id (`new), `opt(`key_F3), Label::NewButton()) + ), `VBox ( - `Label (""), `PushButton (`id (`delete), Label::DeleteButton())) + `Label (""), + `PushButton (`id (`delete), `opt(`key_F5),Label::DeleteButton()) + ) ), `VSpacing(0.5), `Table(`id(`table), `opt(`notify), `header( -- 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] r39909 - /tags/branch-SLE-10-SP1-2_13_28/ldap-client/
by jsuchome＠svn.opensuse.org 02 Aug '07

02 Aug '07

Author: jsuchome Date: Thu Aug 2 17:23:57 2007 New Revision: 39909 URL: http://svn.opensuse.org/viewcvs/yast?rev=39909&view=rev Log: Created tag branch-SLE-10-SP1-2_13_28 for ldap-client Added: tags/branch-SLE-10-SP1-2_13_28/ldap-client/ - copied from r39908, branches/SuSE-SLE-10-SP1-Branch/ldap-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] r39908 - in /branches/SuSE-SLE-10-SP1-Branch/ldap-client: VERSION package/yast2-ldap-client.changes src/ui.ycp
by jsuchome＠svn.opensuse.org 02 Aug '07

02 Aug '07

Author: jsuchome Date: Thu Aug 2 17:23:45 2007 New Revision: 39908 URL: http://svn.opensuse.org/viewcvs/yast?rev=39908&view=rev Log: - do not reinitialize LDAP connection when not needed (#296284) - 2.13.28 Modified: branches/SuSE-SLE-10-SP1-Branch/ldap-client/VERSION branches/SuSE-SLE-10-SP1-Branch/ldap-client/package/yast2-ldap-client.changes branches/SuSE-SLE-10-SP1-Branch/ldap-client/src/ui.ycp Modified: branches/SuSE-SLE-10-SP1-Branch/ldap-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/ldap-c… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/ldap-client/VERSION (original) +++ branches/SuSE-SLE-10-SP1-Branch/ldap-client/VERSION Thu Aug 2 17:23:45 2007 @@ -1 +1 @@ -2.13.27 +2.13.28 Modified: branches/SuSE-SLE-10-SP1-Branch/ldap-client/package/yast2-ldap-client.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/ldap-c… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/ldap-client/package/yast2-ldap-client.changes (original) +++ branches/SuSE-SLE-10-SP1-Branch/ldap-client/package/yast2-ldap-client.changes Thu Aug 2 17:23:45 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Aug 2 17:05:06 CEST 2007 - jsuchome(a)suse.cz + +- do not reinitialize LDAP connection when not needed (#296284) +- 2.13.28 + +------------------------------------------------------------------- Fri Jan 12 11:26:28 CET 2007 - jsuchome(a)suse.cz - dialog for editing PasswordPolicy settings (F301179) Modified: branches/SuSE-SLE-10-SP1-Branch/ldap-client/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/ldap-c… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/ldap-client/src/ui.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/ldap-client/src/ui.ycp Thu Aug 2 17:23:45 2007 @@ -640,7 +640,7 @@ if (base_dn == "") return; - if ((boolean)SCR::Execute (.ldap, $[ + if (Ldap::ldap_initialized || (boolean)SCR::Execute (.ldap, $[ "hostname" : Ldap::GetFirstServer (Ldap::server), "port" : Ldap::GetFirstPort (Ldap::server), "version" : Ldap::ldap_v2 ? 2 : 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] r39907 - /tags/stable-2_15_14/add-on-creator/
by jsuchome＠svn.opensuse.org 02 Aug '07

02 Aug '07

Author: jsuchome Date: Thu Aug 2 17:00:01 2007 New Revision: 39907 URL: http://svn.opensuse.org/viewcvs/yast?rev=39907&view=rev Log: Created tag stable-2_15_14 for add-on-creator Added: tags/stable-2_15_14/add-on-creator/ - copied from r39906, 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] r39906 - in /trunk/add-on-creator: VERSION package/yast2-add-on-creator.changes src/AddOnCreator.ycp src/complex.ycp
by jsuchome＠svn.opensuse.org 02 Aug '07

02 Aug '07

Author: jsuchome Date: Thu Aug 2 16:59:56 2007 New Revision: 39906 URL: http://svn.opensuse.org/viewcvs/yast?rev=39906&view=rev Log: - tag for suggested packages in pattern is Psg, not Prs - licenses saved in /media.1/license directory and not compressed, license.txt duplicated as EULA.txt (F302018) - added button for importing package license text - offered SLE10SP1 products as a base for new AddOn - enable resigning of the packages (#287447) - 2.15.14 Modified: trunk/add-on-creator/VERSION trunk/add-on-creator/package/yast2-add-on-creator.changes trunk/add-on-creator/src/AddOnCreator.ycp trunk/add-on-creator/src/complex.ycp Modified: trunk/add-on-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/VERSION?rev=39906… ============================================================================== --- trunk/add-on-creator/VERSION (original) +++ trunk/add-on-creator/VERSION Thu Aug 2 16:59:56 2007 @@ -1 +1 @@ -2.15.13 +2.15.14 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 Thu Aug 2 16:59:56 2007 @@ -1,4 +1,18 @@ ------------------------------------------------------------------- +Thu Aug 2 14:42:45 CEST 2007 - jsuchome(a)suse.cz + +- tag for suggested packages in pattern is Psg, not Prs +- licenses saved in /media.1/license directory and not compressed, + license.txt duplicated as EULA.txt (F302018) +- added button for importing package license text +- 2.15.14 + +------------------------------------------------------------------- +Tue Jul 31 11:37:23 CEST 2007 - jsuchome(a)suse.cz + +- offered SLE10SP1 products as a base for new AddOn + +------------------------------------------------------------------- Thu Jun 14 14:15:55 CEST 2007 - jsuchome(a)suse.cz - enable resigning of the packages (#287447) 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 Thu Aug 2 16:59:56 2007 @@ -340,7 +340,7 @@ "type" : "package-list", "defval" : [], ], - "Prs" : $[ + "Psg" : $[ // label for 'Prs' pattern key "label" : _("Suggested packages"), // help text for 'Prs' pattern key @@ -898,12 +898,30 @@ // read the license files string license_path = dir_path + "/media.1/license.zip"; + out = $[]; if (FileUtils::Exists (license_path)) { SCR::Execute (.target.bash_output, sformat ("/usr/bin/unzip -o %1 -d %2", license_path, tmpdir)); - map out = (map) SCR::Execute (.target.bash_output, + out = (map) SCR::Execute (.target.bash_output, sformat ("ls -A1 %1/license*.txt 2>/dev/null", tmpdir)); + } + else if (FileUtils::IsDirectory (dir_path + "/media.1/license") == true) + { + license_path = dir_path + "/media.1/license"; + out = (map) SCR::Execute (.target.bash_output, + sformat ("ls -A1 %1/media.1/license/license*.txt 2>/dev/null", + dir_path)); + } + else if (FileUtils::Exists (dir_path + "/EULA.txt")) + { + SCR::Execute (.target.bash, + sformat ("/bin/cp %1/EULA.txt %2/license.txt", dir_path, tmpdir)); + out = (map) SCR::Execute (.target.bash_output, + sformat ("ls -A1 %1/license*.txt 2>/dev/null", tmpdir)); + } + if (out != $[]) + { foreach (string f, splitstring(out["stdout"]:"", "\n"), { if (f == "") return; string name = substring (f, findlastof (f, "/") + 1); @@ -1377,11 +1395,13 @@ // write license.txt files in media.1 dir global boolean WriteLicensesFiles (string media_path, map<string,string> files){ - if (!Package::Install ("zip") || !FileUtils::Exists (media_path)) + if (!FileUtils::Exists (media_path)) return false; boolean ret = true; string cmd = ""; + if (size (files) > 0) + SCR::Execute (.target.mkdir, media_path +"/license"); foreach (string file, string cont, files, { if (cont != "") { @@ -1389,14 +1409,12 @@ if (pos == nil || substring (file, pos) != ".txt") file = file + ".txt"; cmd = cmd + " " + file; - ret = ret && SCR::Write(.target.string, media_path +"/"+ file,cont); + ret = ret && + SCR::Write (.target.string, media_path +"/license/"+ file,cont); + if (file == "license.txt") + SCR::Write (.target.string, base_output_path+"/EULA.txt", cont); } }); - if (ret && cmd != "") - { - cmd = sformat ("cd %1; zip license.zip -m%2", media_path, cmd); - ret = SCR::Execute (.target.bash, cmd) == 0; - } return ret; } @@ -1465,11 +1483,9 @@ string dir = in_path + "/" + arch; if (FileUtils::Exists (dir)) { - string target = full_data_path + "/" + arch; - SCR::Execute (.target.mkdir, target); - y2milestone ("copying from %1 to %2...", dir, target); + y2milestone ("copying from %1 to %2...", dir, full_data_path); SCR::Execute (.target.bash_output, - sformat ("/bin/cp -r %1/*.rpm '%2/'", dir, target)); + sformat ("/bin/cp -r %1 '%2/'", dir, full_data_path)); } }); } Modified: trunk/add-on-creator/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/src/complex.ycp?r… ============================================================================== --- trunk/add-on-creator/src/complex.ycp (original) +++ trunk/add-on-creator/src/complex.ycp Thu Aug 2 16:59:56 2007 @@ -922,6 +922,8 @@ `HBox( `PushButton(`id(`ok),`opt(`default,`key_F10),Label::OKButton()), `PushButton(`id(`cancel),`opt (`key_F9), Label::CancelButton()), + // push button label + `PushButton(`id(`import),`opt (`key_F3), _("I&mport")), `PushButton(`id(`help),`opt (`key_F2), Label::HelpButton()) ) ), @@ -941,6 +943,20 @@ { Wizard::ShowHelp (help); } + if (result == `import) + { + string file = UI::AskForExistingFile ( + AddOnCreator::base_output_path, "", + // popup for file selection dialog + _("Choose the file with the text to be imported") + ); + if (file != nil) + { + string text = (string) SCR::Read (.target.string, file); + if (text != nil) + UI::ChangeWidget (`id(`val), `Value, text); + } + } if (result == `ok) { ret = $[ -- 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] r39905 - in /trunk/storage: libstorage/src/Storage.cc package/yast2-storage.changes
by fehr＠svn.opensuse.org 02 Aug '07

02 Aug '07

Author: fehr Date: Thu Aug 2 16:35:29 2007 New Revision: 39905 URL: http://svn.opensuse.org/viewcvs/yast?rev=39905&view=rev Log: allow mount-by-uuid for swap devices Modified: trunk/storage/libstorage/src/Storage.cc trunk/storage/package/yast2-storage.changes Modified: trunk/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.c… ============================================================================== --- trunk/storage/libstorage/src/Storage.cc (original) +++ trunk/storage/libstorage/src/Storage.cc Thu Aug 2 16:35:29 2007 @@ -4793,7 +4793,7 @@ static FsCapabilitiesX fatCaps (true, false, true, false, false, false, false, 0, 16); - static FsCapabilitiesX swapCaps (true, false, true, false, false, true, + static FsCapabilitiesX swapCaps (true, false, true, false, true, true, true, 16, 64); static FsCapabilitiesX jfsCaps (false, false, false, false, true, true, 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 Thu Aug 2 16:35:29 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Aug 2 16:34:43 CEST 2007 - fehr(a)suse.de + +- allow mount-by-uuid for swap devices + +------------------------------------------------------------------- Wed Aug 1 11:54:37 CEST 2007 - fehr(a)suse.de - prevent mis-detection of all partitions with boot flag set on GPT -- 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] r39904 - /trunk/ncurses/src/pkg/NCPackageSelector.cc
by gs＠svn.opensuse.org 02 Aug '07

02 Aug '07

Author: gs Date: Thu Aug 2 15:09:16 2007 New Revision: 39904 URL: http://svn.opensuse.org/viewcvs/yast?rev=39904&view=rev Log: show Filter: <product summary> after filling the repository list Modified: trunk/ncurses/src/pkg/NCPackageSelector.cc Modified: trunk/ncurses/src/pkg/NCPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/NCPackageSelecto… ============================================================================== --- trunk/ncurses/src/pkg/NCPackageSelector.cc (original) +++ trunk/ncurses/src/pkg/NCPackageSelector.cc Thu Aug 2 15:09:16 2007 @@ -1227,6 +1227,17 @@ //and show the whole stuff to the user pkgList->drawList(); + YWidget * filterLabel = y2ui->widgetWithId( NCPkgNames::Filter(), true ); + + if ( repoPopup && filterLabel ) + { + ZyppProduct product = repoPopup->findProductForRepo( repo ); + if ( product ) + { + static_cast<NCLabel *>(filterLabel)->setLabel( product->summary() ); + } + } + 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