November 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r52866 - /trunk/control-center-gnome/etc/
by coolo＠svn.opensuse.org 04 Nov '08

04 Nov '08

Author: coolo Date: Tue Nov 4 09:46:03 2008 New Revision: 52866 URL: http://svn.opensuse.org/viewcvs/yast?rev=52866&view=rev Log: remove "upstream" translations Modified: trunk/control-center-gnome/etc/yast-gnome-apparmor.directory trunk/control-center-gnome/etc/yast-gnome-hardware.directory trunk/control-center-gnome/etc/yast-gnome-misc.directory trunk/control-center-gnome/etc/yast-gnome-net-devices.directory trunk/control-center-gnome/etc/yast-gnome-net-services.directory trunk/control-center-gnome/etc/yast-gnome-security.directory trunk/control-center-gnome/etc/yast-gnome-software.directory trunk/control-center-gnome/etc/yast-gnome-system.directory Modified: trunk/control-center-gnome/etc/yast-gnome-apparmor.directory URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center-gnome/etc/yast-gn… ============================================================================== --- trunk/control-center-gnome/etc/yast-gnome-apparmor.directory (original) +++ trunk/control-center-gnome/etc/yast-gnome-apparmor.directory Tue Nov 4 09:46:03 2008 @@ -5,5 +5,3 @@ X-SuSE-DocTeamID=ycc_apparmor Name=Novell AppArmor -Name[km]=áá¼ááá AppArmor -Name[sk]=BezpeÄnosÅ¥ a pouÅ¾Ãvatelia Modified: trunk/control-center-gnome/etc/yast-gnome-hardware.directory URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center-gnome/etc/yast-gn… ============================================================================== --- trunk/control-center-gnome/etc/yast-gnome-hardware.directory (original) +++ trunk/control-center-gnome/etc/yast-gnome-hardware.directory Tue Nov 4 09:46:03 2008 @@ -5,21 +5,5 @@ X-SuSE-DocTeamID=ycc_hardware Name=Hardware -Name[cs]=Hardware X-KDE-SubstituteUID=true -Name[bg]=Ð¥Ð°ÑÐ´ÑÐµÑ -Name[el]=Î¥Î»Î¹ÎºÏ -Name[fi]=Laitteisto -Name[fr]=MatÃ©riel -Name[hu]=Hardver -Name[ja]=ãã¼ãã¦ã§ã¢ -Name[km]=ááááááá¹á -Name[nb]=Maskinvare -Name[pa]=à¨à©°à¨¤à¨° -Name[pl]=SprzÄt -Name[ru]=ÐÐ±Ð¾ÑÑÐ´Ð¾Ð²Ð°Ð½Ð¸Ðµ -Name[sv]=HÃ¥rdvara -Name[uk]=ÐÐ±Ð»Ð°Ð´Ð½Ð°Ð½Ð½Ñ -Name[zh_CN]=ç¡¬ä»¶ -Name[zh_TW]=ç¡¬é« Modified: trunk/control-center-gnome/etc/yast-gnome-misc.directory URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center-gnome/etc/yast-gn… ============================================================================== --- trunk/control-center-gnome/etc/yast-gnome-misc.directory (original) +++ trunk/control-center-gnome/etc/yast-gnome-misc.directory Tue Nov 4 09:46:03 2008 @@ -4,26 +4,4 @@ X-SuSE-DocTeamID=ycc_misc Name=Miscellaneous -Name[cs]=RÅ¯znÃ© -Name[bg]=Ð Ð°Ð·Ð½Ð¸ -Name[de]=Andere -Name[el]=ÎÎ¹Î¬ÏÎ¿ÏÎ± -Name[es]=MiscelÃ¡nea -Name[fi]=Sekalaiset -Name[fr]=Divers -Name[hu]=Vegyes -Name[it]=Varie -Name[ja]=ãã®ä» -Name[km]=áááááá -Name[nb]=Diverse -Name[nl]=Diversen -Name[pa]=à¨«à©à¨à¨à¨² -Name[pl]=Inne -Name[pt]=VÃ¡rios -Name[pt_BR]=MiscelÃ¢nea -Name[ru]=Ð Ð°Ð·Ð½Ð¾Ðµ -Name[sv]=Diverse -Name[uk]=Ð ÑÐ·Ð½Ðµ -Name[zh_CN]=æé¡¹ -Name[zh_TW]=å¶ä» Modified: trunk/control-center-gnome/etc/yast-gnome-net-devices.directory URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center-gnome/etc/yast-gn… ============================================================================== --- trunk/control-center-gnome/etc/yast-gnome-net-devices.directory (original) +++ trunk/control-center-gnome/etc/yast-gnome-net-devices.directory Tue Nov 4 09:46:03 2008 @@ -5,28 +5,5 @@ X-SuSE-DocTeamID=ycc_network_devices Name=Network Devices -Name[cs]=SÃÅ¥ovÃ¡ zaÅÃzenÃ -Name[bg]=ÐÑÐµÐ¶Ð¾Ð²Ð¸ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð° -Name[de]=NetzwerkgerÃ¤te -Name[el]=Î£ÏÏÎºÎµÏÎÏ ÎÎ¹ÎºÏÏÎ¿Ï -Name[es]=Dispositivos de red -Name[fi]=Verkkolaitteet -Name[fr]=PÃ©riphÃ©riques rÃ©seau -Name[hu]=HÃ¡lÃ³zati eszkÃ¶zÃ¶k -Name[it]=Dispositivi di rete -Name[ja]=ãããã¯ã¼ã¯ããã¤ã¹ -Name[km]=á§áááááâááááá¶á -Name[nb]=Nettverksenheter -Name[nl]=Netwerkapparaten -Name[pa]=à¨¨à©à©±à¨à¨µà¨°à¨ à¨à©°à¨¤à¨° -Name[pl]=UrzÄdzenia sieciowe -Name[pt]=Dispositivos de Rede -Name[pt_BR]=Dispositivos de Rede -Name[ru]=Ð¡ÐµÑÐµÐ²ÑÐµ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð° -Name[sk]=SieÅ¥ovÃ© zariadenia -Name[sv]=NÃ¤tverksenheter -Name[uk]=ÐÐµÑÐµÐ¶Ð½Ñ Ð¿ÑÐ¸ÑÑÑÐ¾Ñ -Name[zh_CN]=ç½ç»è®¾å¤ -Name[zh_TW]=ç¶²è·¯è£ç½® Modified: trunk/control-center-gnome/etc/yast-gnome-net-services.directory URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center-gnome/etc/yast-gn… ============================================================================== --- trunk/control-center-gnome/etc/yast-gnome-net-services.directory (original) +++ trunk/control-center-gnome/etc/yast-gnome-net-services.directory Tue Nov 4 09:46:03 2008 @@ -5,27 +5,4 @@ X-SuSE-DocTeamID=ycc_network_services Name=Network Services -Name[cs]=SÃÅ¥ovÃ© sluÅ¾by -Name[bg]=ÐÑÐµÐ¶Ð¾Ð²Ð¸ ÑÑÐ»ÑÐ³Ð¸ -Name[de]=Netzwerkdienste -Name[el]=Î¥ÏÎ·ÏÎµÏÎ¯ÎµÏ ÎÎ¹ÎºÏÏÎ¿Ï -Name[es]=Servicios de red -Name[fi]=Verkkopalvelut -Name[fr]=Services rÃ©seau -Name[hu]=HÃ¡lÃ³zati szolgÃ¡ltatÃ¡sok -Name[it]=Servizi di rete -Name[ja]=ãããã¯ã¼ã¯ãµã¼ãã¹ -Name[km]=áááá¶âááááá¶á -Name[nb]=Nettverkstjenester -Name[nl]=Netwerkservices -Name[pa]=à¨¨à©à©±à¨à¨µà¨°à¨ à¨¸à©à¨µà¨¾à¨µà¨¾à¨ -Name[pl]=UsÅugi sieciowe -Name[pt]=ServiÃ§os de Rede -Name[pt_BR]=ServiÃ§os de Rede -Name[ru]=Ð¡ÐµÑÐµÐ²ÑÐµ ÑÐ»ÑÐ¶Ð±Ñ -Name[sk]=SieÅ¥ovÃ© sluÅ¾by -Name[sv]=NÃ¤tverkstjÃ¤nster -Name[uk]=ÐÐµÑÐµÐ¶Ð½Ñ ÑÐ»ÑÐ¶Ð±Ð¸ -Name[zh_CN]=ç½ç»æå¡ -Name[zh_TW]=ç¶²è·¯æå Modified: trunk/control-center-gnome/etc/yast-gnome-security.directory URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center-gnome/etc/yast-gn… ============================================================================== --- trunk/control-center-gnome/etc/yast-gnome-security.directory (original) +++ trunk/control-center-gnome/etc/yast-gnome-security.directory Tue Nov 4 09:46:03 2008 @@ -5,27 +5,4 @@ X-SuSE-DocTeamID=ycc_security Name=Security and Users -Name[cs]=BezpeÄnost a uÅ¾ivatelÃ© -Name[bg]=Ð¡Ð¸Ð³ÑÑÐ½Ð¾ÑÑ Ð¸ Ð¿Ð¾ÑÑÐµÐ±Ð¸ÑÐµÐ»Ð¸ -Name[de]=Sicherheit und Benutzer -Name[el]=ÎÏÏÎ¬Î»ÎµÎ¹Î± ÎºÎ±Î¹ Î§ÏÎ®ÏÏÎµÏ -Name[es]=Seguridad y usuarios -Name[fi]=Tietoturva ja kÃ¤yttÃ¤jÃ¤t -Name[fr]=SÃ©curitÃ© et Utilisateurs -Name[hu]=BiztonsÃ¡g Ã©s felhasznÃ¡lÃ³k -Name[it]=Sicurezza e utenti -Name[ja]=ã»ãã¥ãªãã£ã¨ã¦ã¼ã¶ -Name[km]=áá»ááááá·áá¶á áá·á á¢áááâáááá¾ -Name[nb]=Sikkerhet og brukere -Name[nl]=Beveiliging en gebruikers -Name[pa]=à¨¸à©à¨°à©±à¨à¨¿à¨ à¨à¨¤à© à¨à¨ªà¨à©à¨à© -Name[pl]=Zabezpieczenia i uÅ¼ytkownicy -Name[pt]=SeguranÃ§a e Utilizadores -Name[pt_BR]=SeguranÃ§a e UsuÃ¡rios -Name[ru]=ÐÐ¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ð¸ Ð¸ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑÑ -Name[sk]=BezpeÄnosÅ¥ a pouÅ¾Ãvatelia -Name[sv]=SÃ¤kerhet och anvÃ¤ndare -Name[uk]=ÐÐµÐ·Ð¿ÐµÐºÐ° Ñ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÑ -Name[zh_CN]=å®å¨åç¨æ· -Name[zh_TW]=ä¿å¨æ§èä½¿ç¨è Modified: trunk/control-center-gnome/etc/yast-gnome-software.directory URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center-gnome/etc/yast-gn… ============================================================================== --- trunk/control-center-gnome/etc/yast-gnome-software.directory (original) +++ trunk/control-center-gnome/etc/yast-gnome-software.directory Tue Nov 4 09:46:03 2008 @@ -5,22 +5,5 @@ X-SuSE-DocTeamID=ycc_software Name=Software -Name[cs]=Software -Name[bg]=Ð¡Ð¾ÑÑÑÐµÑ -Name[el]=ÎÎ¿Î³Î¹ÏÎ¼Î¹ÎºÏ -Name[fi]=Ohjelmisto -Name[fr]=Logiciels -Name[hu]=Szoftver -Name[ja]=ã½ããã¦ã§ã¢ -Name[km]=áááááááá -Name[nb]=Programvare -Name[pa]=à¨¸à¨¾à¨«à¨à¨µà©à¨à¨° -Name[pl]=Oprogramowanie -Name[pt]=Programas -Name[ru]=ÐÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ð½Ð¾Ðµ Ð¾Ð±ÐµÑÐ¿ÐµÑÐµÐ½Ð¸Ðµ -Name[sv]=Mjukvara -Name[uk]=ÐÑÐ¾Ð³ÑÐ°Ð¼Ð½Ðµ Ð·Ð°Ð±ÐµÐ·Ð¿ÐµÑÐµÐ½Ð½Ñ -Name[zh_CN]=è½¯ä»¶ -Name[zh_TW]=è»é« Modified: trunk/control-center-gnome/etc/yast-gnome-system.directory URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center-gnome/etc/yast-gn… ============================================================================== --- trunk/control-center-gnome/etc/yast-gnome-system.directory (original) +++ trunk/control-center-gnome/etc/yast-gnome-system.directory Tue Nov 4 09:46:03 2008 @@ -5,23 +5,4 @@ X-SuSE-DocTeamID=ycc_system Name=System -Name[cs]=SystÃ©m -Name[bg]=Ð¡Ð¸ÑÑÐµÐ¼Ð° -Name[el]=Î£ÏÏÏÎ·Î¼Î± -Name[es]=Sistema -Name[fi]=JÃ¤rjestelmÃ¤ -Name[fr]=SystÃ¨me -Name[hu]=Rendszer -Name[it]=Sistema -Name[ja]=ã·ã¹ãã -Name[km]=áááááááá -Name[nl]=Systeem -Name[pa]=à¨¸à¨¿à¨¸à¨à¨® -Name[pt]=Sistema -Name[pt_BR]=Sistema -Name[ru]=Ð¡Ð¸ÑÑÐµÐ¼Ð° -Name[sk]=SystÃ©m -Name[uk]=Ð¡Ð¸ÑÑÐµÐ¼Ð° -Name[zh_CN]=ç³»ç» -Name[zh_TW]=ç³»çµ± -- 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] r52865 - in /trunk/add-on: VERSION package/yast2-add-on.changes src/add-on-workflow.ycp
by locilka＠svn.opensuse.org 04 Nov '08

04 Nov '08

Author: locilka Date: Tue Nov 4 09:34:28 2008 New Revision: 52865 URL: http://svn.opensuse.org/viewcvs/yast?rev=52865&view=rev Log: - Hiding back button instead of disabling it (acccording to YaST Style Guide) (bnc #440565). - 2.17.8 Modified: trunk/add-on/VERSION trunk/add-on/package/yast2-add-on.changes trunk/add-on/src/add-on-workflow.ycp Modified: trunk/add-on/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/VERSION?rev=52865&r1=5286… ============================================================================== --- trunk/add-on/VERSION (original) +++ trunk/add-on/VERSION Tue Nov 4 09:34:28 2008 @@ -1 +1 @@ -2.17.7 +2.17.8 Modified: trunk/add-on/package/yast2-add-on.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/package/yast2-add-on.chan… ============================================================================== --- trunk/add-on/package/yast2-add-on.changes (original) +++ trunk/add-on/package/yast2-add-on.changes Tue Nov 4 09:34:28 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Nov 4 09:32:38 CET 2008 - locilka(a)suse.cz + +- Hiding back button instead of disabling it (acccording to YaST + Style Guide) (bnc #440565). +- 2.17.8 + +------------------------------------------------------------------- Mon Nov 3 17:37:44 CET 2008 - locilka(a)suse.cz - Make `cancel behave like `abort (bnc #439435). Modified: trunk/add-on/src/add-on-workflow.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/src/add-on-workflow.ycp?r… ============================================================================== --- trunk/add-on/src/add-on-workflow.ycp (original) +++ trunk/add-on/src/add-on-workflow.ycp Tue Nov 4 09:34:28 2008 @@ -1066,6 +1066,7 @@ true ); + Wizard::HideBackButton(); Wizard::SetAbortButton (`abort, Label::CancelButton()); Wizard::SetNextButton (`next, Label::OKButton()); } @@ -1372,6 +1373,8 @@ } } + Wizard::RestoreBackButton(); + return 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] r52863 - /trunk/gtk/src/yzyppwrapper.cc
by rpmcruz＠svn.opensuse.org 04 Nov '08

04 Nov '08

Author: rpmcruz Date: Tue Nov 4 02:03:47 2008 New Revision: 52863 URL: http://svn.opensuse.org/viewcvs/yast?rev=52863&view=rev Log: Don't reverse zypp's version order. Modified: trunk/gtk/src/yzyppwrapper.cc Modified: trunk/gtk/src/yzyppwrapper.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/yzyppwrapper.cc?rev=5286… ============================================================================== --- trunk/gtk/src/yzyppwrapper.cc (original) +++ trunk/gtk/src/yzyppwrapper.cc Tue Nov 4 02:03:47 2008 @@ -1033,7 +1033,7 @@ (*it)->arch() == candidateObj->arch()) continue; Ypp::Package::Version *version = constructVersion (*it, installedObj); - m_availableVersions = g_slist_prepend (m_availableVersions, version); + m_availableVersions = g_slist_append (m_availableVersions, version); } if (candidateObj) { // make sure this goes first Ypp::Package::Version *version = constructVersion (candidateObj, installedObj); -- 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] r52862 - /trunk/storage/libstorage/src/Region.h
by aschnell＠svn.opensuse.org 03 Nov '08

03 Nov '08

Author: aschnell Date: Mon Nov 3 19:15:58 2008 New Revision: 52862 URL: http://svn.opensuse.org/viewcvs/yast?rev=52862&view=rev Log: - tiny code improvment Modified: trunk/storage/libstorage/src/Region.h Modified: trunk/storage/libstorage/src/Region.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Region.h?… ============================================================================== --- trunk/storage/libstorage/src/Region.h (original) +++ trunk/storage/libstorage/src/Region.h Mon Nov 3 19:15:58 2008 @@ -20,7 +20,7 @@ Region intersect( const Region& r ) const { Region ret; - if( r.start() <= end() && r.end() >= start() ) + if (doIntersect(r)) { unsigned long s = std::max( r.start(), start() ); unsigned long e = std::min( r.end(), end() ); -- 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] r52861 - /trunk/storage/storage/src/modules/Storage.ycp
by aschnell＠svn.opensuse.org 03 Nov '08

03 Nov '08

Author: aschnell Date: Mon Nov 3 19:14:26 2008 New Revision: 52861 URL: http://svn.opensuse.org/viewcvs/yast?rev=52861&view=rev Log: - added GetCommitInfo wrapper 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 Mon Nov 3 19:14:26 2008 @@ -66,6 +66,7 @@ import "LibStorage::DmraidCoInfo"; import "LibStorage::DmmultipathCoInfo"; import "LibStorage::PartitionSlotInfo"; + import "LibStorage::CommitInfo"; map<string,any> conv_ctype = $[ "def_sym" : `CT_UNKNOWN, @@ -3965,6 +3966,20 @@ return( ret ); } + +global map<symbol, any> GetCommitInfo() +{ + any info = LibStorage::CommitInfo::new("LibStorage::CommitInfo"); + LibStorage::StorageInterface::getCommitInfo(sint, true, info); + + map<symbol, any> ret = $[ + `destructive : LibStorage::CommitInfo::swig_destructive_get(info) + ]; + + return ret; +} + + string save_chtxt = ""; global string ChangeText() -- 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] r52860 - in /trunk/gtk: ChangeLog src/yzyppwrapper.cc
by rpmcruz＠svn.opensuse.org 03 Nov '08

03 Nov '08

Author: rpmcruz Date: Mon Nov 3 19:11:53 2008 New Revision: 52860 URL: http://svn.opensuse.org/viewcvs/yast?rev=52860&view=rev Log: * src/yzyppwrapper.cc: bug fix 441143: use candidate object as the newest version -- just looking at the numbers ignores the arch. Modified: trunk/gtk/ChangeLog trunk/gtk/src/yzyppwrapper.cc Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=52860&r1=52859… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Mon Nov 3 19:11:53 2008 @@ -1,3 +1,8 @@ +2008-11-03 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/yzyppwrapper.cc: bug fix 441143: use candidate object as the + newest version -- just looking at the numbers ignores the arch. + 2008-11-02 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/YGProgressBar.cc: got rid of ygtkprogressbar. Modified: trunk/gtk/src/yzyppwrapper.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/yzyppwrapper.cc?rev=5286… ============================================================================== --- trunk/gtk/src/yzyppwrapper.cc (original) +++ trunk/gtk/src/yzyppwrapper.cc Mon Nov 3 19:11:53 2008 @@ -1000,13 +1000,14 @@ m_sel->setStatus (status); } - static Ypp::Package::Version *constructVersion (ZyppObject object) + static Ypp::Package::Version *constructVersion ( + ZyppObject object, ZyppObject installedObj) { Ypp::Package::Version *version = new Ypp::Package::Version(); version->number = object->edition().asString(); version->arch = object->arch().asString(); version->repo = ypp->impl->getRepository (object->repoInfo().alias()); - version->cmp = 0; + version->cmp = installedObj ? zypp::Edition::compare (object->edition(), installedObj->edition()) : 0; version->impl = (void *) get_pointer (object); return version; } @@ -1016,7 +1017,7 @@ if (!m_installedVersion) { const ZyppObject installedObj = m_sel->installedObj(); assert (installedObj != NULL); - m_installedVersion = constructVersion (installedObj); + m_installedVersion = constructVersion (installedObj, NULL); } return m_installedVersion; } @@ -1025,13 +1026,20 @@ { if (!m_availableVersions) { const ZyppObject installedObj = m_sel->installedObj(); + const ZyppObject candidateObj = m_sel->candidateObj(); for (zypp::ui::Selectable::available_iterator it = m_sel->availableBegin(); it != m_sel->availableEnd(); it++) { - Ypp::Package::Version *version = constructVersion (*it); - if (installedObj) - version->cmp = zypp::Edition::compare ((*it)->edition(), installedObj->edition()); - m_availableVersions = g_slist_append (m_availableVersions, version); + if (candidateObj && (*it)->edition() == candidateObj->edition() && + (*it)->arch() == candidateObj->arch()) + continue; + Ypp::Package::Version *version = constructVersion (*it, installedObj); + m_availableVersions = g_slist_prepend (m_availableVersions, version); + } + if (candidateObj) { // make sure this goes first + Ypp::Package::Version *version = constructVersion (candidateObj, installedObj); + m_availableVersions = g_slist_prepend (m_availableVersions, version); } +#if 0 // let zypp order prevail struct inner { static gint version_compare (gconstpointer pa, gconstpointer pb) { @@ -1042,6 +1050,7 @@ } }; m_availableVersions = g_slist_sort (m_availableVersions, inner::version_compare); +#endif } return (Ypp::Package::Version *) g_slist_nth_data (m_availableVersions, nb); } -- 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] r52859 - /trunk/installation/src/include/misc.ycp
by locilka＠svn.opensuse.org 03 Nov '08

03 Nov '08

Author: locilka Date: Mon Nov 3 18:55:21 2008 New Revision: 52859 URL: http://svn.opensuse.org/viewcvs/yast?rev=52859&view=rev Log: Remove the whole line Modified: trunk/installation/src/include/misc.ycp Modified: trunk/installation/src/include/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/include/misc.yc… ============================================================================== --- trunk/installation/src/include/misc.ycp (original) +++ trunk/installation/src/include/misc.ycp Mon Nov 3 18:55:21 2008 @@ -297,7 +297,7 @@ // writes 'SecondStageRequired' '1' or '0' // if such tag exists, it is removed before WFM::Execute (.local.bash, sformat ( - "sed --in-place 's/^%1: .*//' %3; echo '%1: %2' >> %3", + "sed --in-place '/^%1: .*/D' %3; echo '%1: %2' >> %3", "SecondStageRequired", (scst_required == false ? "0":"1"), "/etc/install.inf" -- 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] r52858 - in /trunk/installation: VERSION package/yast2-installation.changes src/include/inst_inc_first.ycp src/include/inst_inc_second.ycp src/include/misc.ycp
by locilka＠svn.opensuse.org 03 Nov '08

03 Nov '08

Author: locilka Date: Mon Nov 3 18:43:26 2008 New Revision: 52858 URL: http://svn.opensuse.org/viewcvs/yast?rev=52858&view=rev Log: - Writing 'SecondStageRequired' 0/1 to /etc/install.inf even while rebooting during second stage (bnc #432005). - 2.17.26 Modified: trunk/installation/VERSION trunk/installation/package/yast2-installation.changes trunk/installation/src/include/inst_inc_first.ycp trunk/installation/src/include/inst_inc_second.ycp trunk/installation/src/include/misc.ycp Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=52858&r… ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Mon Nov 3 18:43:26 2008 @@ -1 +1 @@ -2.17.25 +2.17.26 Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Mon Nov 3 18:43:26 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Nov 3 18:34:30 CET 2008 - locilka(a)suse.cz + +- Writing 'SecondStageRequired' 0/1 to /etc/install.inf even while + rebooting during second stage (bnc #432005). +- 2.17.26 + +------------------------------------------------------------------- Mon Nov 03 14:28:14 CET 2008 - aschnell(a)suse.de - better reboot message during ssh installation (bnc #439572 and Modified: trunk/installation/src/include/inst_inc_first.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/include/inst_in… ============================================================================== --- trunk/installation/src/include/inst_inc_first.ycp (original) +++ trunk/installation/src/include/inst_inc_first.ycp Mon Nov 3 18:43:26 2008 @@ -147,25 +147,6 @@ } } - /** - * Writes to /etc/install.inf whether running the second stage is required - * This is written to inst-sys and not copied to the installed system - * (which is already umounted in that time). - * - * @see BNC #439572 - */ - void WriteSecondStageRequired (boolean scst_required) { - // writes 'SecondStageRequired' '1' or '0' - // if such tag exists, it is removed before - WFM::Execute (.local.bash, sformat ( - "sed --in-place 's/^%1: .*//' %3; echo '%1: %2' >> %3", - "SecondStageRequired", - (scst_required == false ? "0":"1"), - "/etc/install.inf" - )); - Linuxrc::ResetInstallInf(); - } - void HandleSecondStageRequired () { if (Stage::initial()) { // the current one is 'initial' Modified: trunk/installation/src/include/inst_inc_second.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/include/inst_in… ============================================================================== --- trunk/installation/src/include/inst_inc_second.ycp (original) +++ trunk/installation/src/include/inst_inc_second.ycp Mon Nov 3 18:43:26 2008 @@ -352,6 +352,10 @@ } symbol PrepareYaSTforRestart (symbol ret) { + // bnc #432005 + // After reboot, YaST will be started (inform user what to do if needed) + boolean yast_needs_rebooting = false; + // restarting yast, removing files that identify the user-abort or installation-crash // bugzilla #222896 if (FileUtils::Exists (Installation::file_inst_aborted)) SCR::Execute (.target.remove, Installation::file_inst_aborted); @@ -376,6 +380,9 @@ y2milestone ("Creating %1 file", Installation::reboot_file); SCR::Execute (.target.bash, sformat ( "touch %1", Installation::reboot_file)); + // bnc #432005 + y2milestone ("YaST needs rebooting"); + yast_needs_rebooting = true; } else if (ret == `restart_yast) { y2milestone ("Creating %1 file", Installation::restart_file); @@ -383,6 +390,8 @@ "touch %1", Installation::restart_file)); } + WriteSecondStageRequired (yast_needs_rebooting); + return ret; } Modified: trunk/installation/src/include/misc.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/include/misc.yc… ============================================================================== --- trunk/installation/src/include/misc.ycp (original) +++ trunk/installation/src/include/misc.ycp Mon Nov 3 18:43:26 2008 @@ -286,4 +286,23 @@ } } + /** + * Writes to /etc/install.inf whether running the second stage is required + * This is written to inst-sys and not copied to the installed system + * (which is already umounted in that time). + * + * @see BNC #439572 + */ + void WriteSecondStageRequired (boolean scst_required) { + // writes 'SecondStageRequired' '1' or '0' + // if such tag exists, it is removed before + WFM::Execute (.local.bash, sformat ( + "sed --in-place 's/^%1: .*//' %3; echo '%1: %2' >> %3", + "SecondStageRequired", + (scst_required == false ? "0":"1"), + "/etc/install.inf" + )); + Linuxrc::ResetInstallInf(); + } + } //end of include -- 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] r52857 - /tags/stable-2_17_7/add-on/
by locilka＠svn.opensuse.org 03 Nov '08

03 Nov '08

Author: locilka Date: Mon Nov 3 17:41:07 2008 New Revision: 52857 URL: http://svn.opensuse.org/viewcvs/yast?rev=52857&view=rev Log: Created tag stable-2_17_7 for add-on Added: tags/stable-2_17_7/add-on/ - copied from r52856, trunk/add-on/ -- 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] r52856 - in /trunk/add-on: VERSION package/yast2-add-on.changes src/add-on-workflow.ycp
by locilka＠svn.opensuse.org 03 Nov '08

03 Nov '08

Author: locilka Date: Mon Nov 3 17:40:17 2008 New Revision: 52856 URL: http://svn.opensuse.org/viewcvs/yast?rev=52856&view=rev Log: - Make `cancel behave like `abort (bnc #439435). - 2.17.7 Modified: trunk/add-on/VERSION trunk/add-on/package/yast2-add-on.changes trunk/add-on/src/add-on-workflow.ycp Modified: trunk/add-on/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/VERSION?rev=52856&r1=5285… ============================================================================== --- trunk/add-on/VERSION (original) +++ trunk/add-on/VERSION Mon Nov 3 17:40:17 2008 @@ -1 +1 @@ -2.17.6 +2.17.7 Modified: trunk/add-on/package/yast2-add-on.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/package/yast2-add-on.chan… ============================================================================== --- trunk/add-on/package/yast2-add-on.changes (original) +++ trunk/add-on/package/yast2-add-on.changes Mon Nov 3 17:40:17 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Nov 3 17:37:44 CET 2008 - locilka(a)suse.cz + +- Make `cancel behave like `abort (bnc #439435). +- 2.17.7 + +------------------------------------------------------------------- Tue Oct 14 13:00:52 CEST 2008 - locilka(a)suse.cz - Add-Ons AutoYaST client now sets the product name if found by Modified: trunk/add-on/src/add-on-workflow.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/src/add-on-workflow.ycp?r… ============================================================================== --- trunk/add-on/src/add-on-workflow.ycp (original) +++ trunk/add-on/src/add-on-workflow.ycp Mon Nov 3 17:40:17 2008 @@ -1345,7 +1345,7 @@ while (true) { userret = UI::UserInput(); - if (userret == `abort) { + if (userret == `abort || userret == `cancel) { ret = `abort; break; } else if (userret == `next || userret == `finish) { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0