January 2010 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r60354 - /trunk/core/libycp/src/YCPBuiltinString.cc
by aschnell＠svn.opensuse.org 14 Jan '10

14 Jan '10

Author: aschnell Date: Thu Jan 14 10:53:10 2010 New Revision: 60354 URL: http://svn.opensuse.org/viewcvs/yast?rev=60354&view=rev Log: - fixed documentation Modified: trunk/core/libycp/src/YCPBuiltinString.cc Modified: trunk/core/libycp/src/YCPBuiltinString.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/src/YCPBuiltinString… ============================================================================== --- trunk/core/libycp/src/YCPBuiltinString.cc (original) +++ trunk/core/libycp/src/YCPBuiltinString.cc Thu Jan 14 10:53:10 2010 @@ -467,7 +467,7 @@ * @param string STRING1 String * @param string STRING2 Substring * @return integer OFFSET - * If substring is not found find returns `nil'. + * If substring is not found search returns `nil'. * * @description * -- 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] r60353 - in /trunk/storage: package/yast2-storage.changes storage/src/include/ep-lib.ycp
by aschnell＠svn.opensuse.org 13 Jan '10

13 Jan '10

Author: aschnell Date: Wed Jan 13 19:25:27 2010 New Revision: 60353 URL: http://svn.opensuse.org/viewcvs/yast?rev=60353&view=rev Log: - fixed importing mount points for cases where the proposal has deleted partitions (bnc #463327) Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/ep-lib.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 Wed Jan 13 19:25:27 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Jan 13 18:40:58 CET 2010 - aschnell(a)suse.de + +- fixed importing mount points for cases where the proposal has + deleted partitions (bnc #463327) + +------------------------------------------------------------------- Wed Jan 13 14:54:47 CET 2010 - fehr(a)suse.de - set fs to detected fs when format is set to false to prevent Modified: trunk/storage/storage/src/include/ep-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-l… ============================================================================== --- trunk/storage/storage/src/include/ep-lib.ycp (original) +++ trunk/storage/storage/src/include/ep-lib.ycp Wed Jan 13 19:25:27 2010 @@ -273,19 +273,20 @@ void ImportMountPoints() { - map<string,map> od = (map<string,map>)Storage::GetOndiskTarget(); - list<list> fstab = scanAndReadExistingFstab( od ); + Storage::CreateTargetBackup("import"); + Storage::ResetOndiskTarget(); + + map<string, map> target_map = Storage::GetOndiskTarget(); + list<list> fstab = scanAndReadExistingFstab(target_map); y2milestone( "adapt_mp fstab %1", fstab ); - list ti = maplist( list e, fstab, ``(AddFstabToData( od, (list<map>)e)[1]:$[])); + list ti = maplist( list e, fstab, ``(AddFstabToData( target_map, (list<map>)e)[1]:$[])); y2milestone( "adapt_mp ti %1", ti ); integer idx = FstabAddDialog( ti ); if( idx>=0 ) { - od = (map<string,map>)Storage::GetOndiskTarget(); y2milestone( "adapt_mp use fstab idx %1", idx ); - ti = AddFstabToData( od, (list<map>)fstab[idx]:[] ); - Storage::ResetOndiskTarget(); + ti = AddFstabToData( target_map, (list<map>)fstab[idx]:[] ); foreach( string d, map disk, ti[0]:$[], ``{ foreach( map p, disk["partitions"]:[], @@ -299,7 +300,13 @@ } }); }); + Storage::SetTargetMap(ti[0]:$[]); + Storage::DisposeTargetBackup("import"); + } + else + { + Storage::RestoreTargetBackup("import"); } } -- 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] r60352 - in /branches/SuSE-Code-11-SP1-Branch/registration: ./ package/ src/clients/ src/modules/
by jdsn＠svn.opensuse.org 13 Jan '10

13 Jan '10

Author: jdsn Date: Wed Jan 13 18:59:53 2010 New Revision: 60352 URL: http://svn.opensuse.org/viewcvs/yast?rev=60352&view=rev Log: port changes from Code11 to Code11 SP1 (2.17.26-28) * port webyast API to SLE11 - 2.17.26 * fix XML format for stateless registration API - 2.17.27 * fixes in REST API to prevent server error and loops (bnc#553244) 2.17.28 always reset registration server url (bnc#557194) 2.17.29 Added: branches/SuSE-Code-11-SP1-Branch/registration/package/org.opensuse.yast.modules.ysr.policy 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/clients/inst_suse_register.ycp branches/SuSE-Code-11-SP1-Branch/registration/src/modules/Register.ycp branches/SuSE-Code-11-SP1-Branch/registration/src/modules/YSR.pm branches/SuSE-Code-11-SP1-Branch/registration/yast2-registration.spec.in 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 Wed Jan 13 18:59:53 2010 @@ -1 +1 @@ -2.17.25 +2.17.29 Added: branches/SuSE-Code-11-SP1-Branch/registration/package/org.opensuse.yast.modules.ysr.policy URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/regis… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/registration/package/org.opensuse.yast.modules.ysr.policy (added) +++ branches/SuSE-Code-11-SP1-Branch/registration/package/org.opensuse.yast.modules.ysr.policy Wed Jan 13 18:59:53 2010 @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE policyconfig PUBLIC "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN" + "http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd"> + +<policyconfig> + <vendor>Novell, Inc.</vendor> + <vendor_url>http://www.novell.com</vendor_url> + + <action id="org.opensuse.yast.modules.ysr.statelessregister"> + <description>Run a registration in stateless context.</description> + <message>Could not run YSR.stateless_register.</message> + <defaults> + <allow_any>no</allow_any> + <allow_inactive>no</allow_inactive> + <allow_active>auth_admin_keep_session</allow_active> + </defaults> + </action> + + <action id="org.opensuse.yast.modules.ysr.getregistrationconfig"> + <description>Get registration information.</description> + <message>Could not run YSR.get_registrationConfig.</message> + <defaults> + <allow_any>no</allow_any> + <allow_inactive>no</allow_inactive> + <allow_active>auth_admin_keep_session</allow_active> + </defaults> + </action> + + <action id="org.opensuse.yast.modules.ysr.setregistrationconfig"> + <description>Set registration information.</description> + <message>Could not run YSR.set_registrationConfig.</message> + <defaults> + <allow_any>no</allow_any> + <allow_inactive>no</allow_inactive> + <allow_active>auth_admin_keep_session</allow_active> + </defaults> + </action> + +</policyconfig> + 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 Wed Jan 13 18:59:53 2010 @@ -1,4 +1,15 @@ ------------------------------------------------------------------- +Wed Jan 13 18:26:17 CET 2010 - jdsn(a)suse.de + +- port changes from Code11 to Code11 SP1 (2.17.26-28) + * port webyast API to SLE11 - 2.17.26 + * fix XML format for stateless registration API - 2.17.27 + * fixes in REST API to prevent server error and loops + (bnc#553244) - 2.17.28 +- always reset registration server url (bnc#557194) +- 2.17.29 + +------------------------------------------------------------------- Thu Apr 23 21:14:23 CEST 2009 - jdsn(a)suse.de - check boolean values also for nil to prevent crashes (bnc#516330) Modified: branches/SuSE-Code-11-SP1-Branch/registration/src/clients/inst_suse_register.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/regis… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/registration/src/clients/inst_suse_register.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/registration/src/clients/inst_suse_register.ycp Wed Jan 13 18:59:53 2010 @@ -673,6 +673,8 @@ Register::smt_server_cert = curRegCert; y2milestone("New registration server: %1", curRegURL); y2milestone("New registration server CA certificate location: %1", curRegCert); + // run setup again, make sure settings get reset (maybe registration was already initalized and an error occurred) (bnc#557194) + Register::setupRegistrationServer(nil); status=true; break; } 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 Wed Jan 13 18:59:53 2010 @@ -280,6 +280,8 @@ */ global symbol setupRegistrationServer(symbol mode) { + // invalidate a previous registration initialization as now settings may change (bnc#557194) + isInitializedSR = false; // in case smt_server is undefined nothing needs to be done if (smt_server == nil || smt_server == "") return `ok; 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 Wed Jan 13 18:59:53 2010 @@ -2,7 +2,7 @@ # Copyright (c) 2008 SUSE LINUX Products GmbH. All rights reserved. # # Author: Michael Calmer <mc(a)suse.de>, 2008 -# Editor: J. Daniel Schmidt <jdsn(a)suse.de>, 2008 +# Editor: J. Daniel Schmidt <jdsn(a)suse.de>, 2008,2009 # # YSR.pm - interface for YaST to interact with SUSE::SuseRegister # @@ -12,6 +12,9 @@ use strict; use SUSE::SuseRegister; use Data::Dumper; +use XML::Simple; + +use YaPI; our %TYPEINFO; @@ -120,11 +123,11 @@ { if(defined $value && ref($value) eq "HASH" ) { - $global_ctx->{args}->{key} = $value; + $global_ctx->{args}->{$key} = $value; } else { - delete $global_ctx->{args}->{key}; + delete $global_ctx->{args}->{$key}; } } } @@ -179,6 +182,559 @@ } } + +BEGIN { $TYPEINFO{statelessregister} = ["function", [ "map", "string", "any"], ["map", "string", "any"], ["map", "string", "any"]]; } +sub statelessregister +{ + my $self = shift; + my $ctx = shift; + my $arguments = shift; + my $SRregisterFlagFile = '/var/lib/yastws/registration_successful'; + + unless ( defined $ctx && ref($ctx) eq "HASH" ) + { + return { 'error' => 'The context is missing or invalid.', + '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' => $init_err + }; + } + } + + # set arguments + # must be set one for one, otherwise other data would be overwritten + foreach my $key ( keys %{$arguments} ) + { + ## $self->set_arg( $key, { flag => 'i', value => ${$arguments}{$key} , kind => 'mandatory' } ); + ## $self->set_arg( $key, { value => ${$arguments}{$key} } ); + $self->set_arg( $key, { 'value' => ${$arguments}{$key} } ); + } + + # run registration + my $exitcode = 1; + my $errorcode = 0; + my $readabletext = ''; + my $tasklist = ''; + my $manualurl = ''; + my @log = []; + + my $counter = 0; + do + { + $exitcode = $self->register(); + $counter++; + } while ( $exitcode == 1 && $counter < 5 ); + + $errorcode = $self->get_errorcode(); + $readabletext = $self->get_registerReadableText(); + $manualurl = $self->get_manualURL(); + + + my $regret = { 'exitcode' => $exitcode + ,'errorcode' => $errorcode + ,'readabletext' => $readabletext + ,'manualurl' => $manualurl + }; + + if ( $exitcode == 0 ) + { + # successful registration, so we need to save the last ZMD config + $self->saveLastZmdConfig(); + $tasklist = $self->getTaskList() || {}; + my $ret = $self->changerepos($tasklist); + + if ( ref($ret) eq 'HASH' ) + { + my $rlog = ${$ret}{'log'} || []; + ${$regret}{'repochangeslog'} = XMLout( { 'log' => $rlog}, rootname => 'log' ); + + my $errcount = 0; + foreach my $logline ( @{$rlog} ) + { + $errcount++ if $logline =~ /^ERROR:/; + } + ${$regret}{'repochangeerrors'} = $errcount if $errcount > 0; + } + + ${$regret}{'success'} = 'Successfully ran registration'; + # prepare the tasklist for XML conversion + foreach my $k (keys %{$tasklist}) + { + if ( exists ${${$tasklist}{$k}}{'CATALOGS'} ) + { + ${${$tasklist}{$k}}{'CATALOGS'} = { 'catalog' => ${${$tasklist}{$k}}{'CATALOGS'} }; + } + } + ${$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; + + # to be on the safe side for a following registration request, we need to delete the context data + $self->del_ctx(); + } + elsif ( $exitcode == 3 ) + { + ${$regret}{'error'} = 'Conflicting registration data'; + ${$regret}{'conflicterror'} = '1'; + } + elsif ( $exitcode == 4 ) + { + ${$regret}{'missinginfo'} = 'Missing Information'; + my $margs = $self->get_args() || {}; + ${$regret}{'missingarguments'} = XMLout($margs, rootname => 'missingarguments'); + } + elsif ( $exitcode == 100 || $exitcode == 101 ) + { + ${$regret}{'error'} = 'No products to register'; + ${$regret}{'noproducterror'} = '1'; + } + else + { + ${$regret}{'error'} = 'Registration was not successful'; + } + + return $regret; +} + + +BEGIN { $TYPEINFO{getregistrationconfig} = ["function", [ "map", "string", "any"] ]; } +sub getregistrationconfig +{ + my $self = shift; + 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; + my $guid = undef; + + # read the registration server url + if ( -e $SRconf ) + { + if (open(CNF, "< $SRconf") ) + { + while(<CNF>) + { + next if($_ =~ /^\s*#/); + + if($_ =~ /^url\s*=\s*(\S*)\s*/ && defined $1 && $1 ne '') + { $url = $1; } + } + close CNF; + } + } + + #read the registration server ca certificate file + if ( -e $SRcert ) + { + my $separator = $/; + local $/ = undef; + if ( open(CERT, "< $SRcert") ) + { + $cert = <CERT>; + close CERT; + } + $/ = $separator; + } + + # read the guid + if ( -e $SRcredentials && -e $SRregisterFlagFile ) + { + if (open(CRED, "< $SRcredentials") ) + { + while(<CRED>) + { + next if($_ =~ /^\s*#/); + + if($_ =~ /^\s*username\s*=\s*(\S*)\s*/ && defined $1 && $1 ne '') + { $guid = $1; } + } + close CRED; + } + } + + $url = '' unless defined $url; + $cert = '' unless defined $cert; + $guid = '' unless defined $guid; + + # delete a flagfile that might be still there if no guid is found + unlink($SRregisterFlagFile) if $guid eq ''; + + return { "regserverurl" => $url, + "regserverca" => $cert, + "guid" => $guid }; +} + + +BEGIN { $TYPEINFO{setregistrationconfig} = ["function", "integer", [ "map", "string", "string"] ]; } +sub setregistrationconfig +{ + my $self = shift; + my $config = shift; + + my $SRconf = '/etc/suseRegister.conf'; + my $SRcertpath = '/etc/ssl/certs/'; + my $SRcert = "$SRcertpath/registration-server.pem"; + my $SRcertnew = "$SRcertpath/registration-server.pem_new"; + + my $url = ${$config}{'regserverurl'} || undef; + my $cert = ${$config}{'regserverca'} || undef; + my $newconfig = ''; + my $success = 0; + + # write the new registration server url to the suseRegister.conf file + if ($url && $url =~ /^https:\/\//) + { + if ( -e $SRconf ) + { + if (open(CNFR, "< $SRconf") ) + { + while(<CNFR>) + { + $_ =~ s/^url\s*=\s*(\S*)\s*/url = $url\n/; + $newconfig .= $_; + } + close CNFR; + + if ( open(CNFW, "> $SRconf") ) + { + print CNFW $newconfig; + close CNFW; + $success += 1; + } + } + } + } + + # write the new certificate and rehash the directory + if ($cert) + { + if ( open(CERT, "> $SRcertnew") ) + { + print CERT $cert; + close CERT; + # writing the file succeeded + $success += 2; + + my @verifyargs = ('openssl', 'x509', '-in', "$SRcertnew", '-text'); + if ( system( @verifyargs ) == 0 ) + { + my @moveargs = ('mv', "$SRcertnew", "$SRcert" ); + if ( system( @moveargs ) == 0 ) + { + # certificate validation succeeded and it was moved to the real file name + $success += 4; + + # rehash the certificate pool + my @rehashargs = ('c_rehash', '/etc/ssl/certs/'); + if ( system( @rehashargs ) == 0 ) + { + # c_rehashing of certificate pool succeeded + $success += 8; + } + } + } + else + { + # delete the *_new file + unlink( $SRcertnew ); + # correct the success status + $success -= 2; + } + } + } + + return $success; +} + +# +# check catalogs +# +# check catalogs of services and apply changes according to the CATALOGS-subhash of the getTaskList hash +# +sub checkcatalogs +{ + my $self = shift; + my $todo = shift; + my $pService = shift; + + return ["Service name is undefined. Can not check the catalogs."] unless ( defined $pService ); + return ["Catalog list is empty. No catalogs to check."] unless ( defined $todo && ref($todo) eq 'HASH' ); + + my @log = []; + my ($catalog, $pAny); + + foreach $catalog (keys %{$todo}) + { + $pAny = ${$todo}{$catalog}; + if ( not defined $catalog || $catalog eq '' ) + { + push @log, "A catalog returned by SuseRegister has no or an invalid name."; + } + elsif ( not defined $pAny || ref($pAny) ne 'HASH' ) + { + push @log, "A catalog returned by SuseRegister did not contain any details: $catalog"; + } + else + { + if ( not exists ${$pAny}{'ALIAS'} || not defined ${$pAny}{'ALIAS'} || ${$pAny}{'ALIAS'} eq '' ) + { + push @log, "A catalog returned by SuseRegister has no or an invalid alias name."; + } + else + { + if ( not exists ${$pAny}{'TASK'} || not defined ${$pAny}{'TASK'} || ${$pAny}{'TASK'} eq '' ) + { + push @log, "A catalog returned by SuseRegister has an invalid task: $catalog ($pService)"; + } + elsif ( ${$pAny}{"TASK"} eq 'le' || ${$pAny}{"TASK"} eq 'ld') + { + push @log, "According to SuseRegister a catalog does not need to be changed: $catalog ($pService)"; + } + elsif ( ${$pAny}{"TASK"} eq 'a' ) + { + push @log, "According to SuseRegister a catalog has to be enabled: $catalog ($pService)"; + my @zCMD = ('zypper', '--non-interactive', 'modifyrepo', '--enable', "${$pAny}{'ALIAS'}"); + if ( system(@zCMD) == 0 ) + { + push @log, "Enabled catalog: ${$pAny}{'ALIAS'} ($pService)"; + } + else + { + push @log, "ERROR: Could not enable catalog: ${$pAny}{'ALIAS'} ($pService)"; + } + } + elsif ( ${$pAny}{"TASK"} eq 'd' ) + { + push @log, "According to SuseRegister a service has to be disabled: $catalog ($pService)"; + my @zCMD = ('zypper', '--non-interactive', 'modifyrepo', '--disable', ${$pAny}{'ALIAS'}); + if ( system(@zCMD) == 0 ) + { + push @log, "Disabled catalog: ${$pAny}{'ALIAS'} ($pService)"; + } + else + { + push @log, "ERROR: Could not enable catalog: ${$pAny}{'ALIAS'} ($pService)"; + } + } + } + } + } + + return @log; +} + + +# +# change repos according to todo-list +# +# takes the resulting hash of getTaskList +# +BEGIN { $TYPEINFO{changerepos} = ["function", [ "map", "string", "any"], [ "map", "string", "any"] ]; } +sub changerepos +{ + my $self = shift; + my $todo = shift; + my @log = []; + + unless (defined $todo && ref($todo) eq "HASH" && keys %{$todo} > 0) + { + push @log, "No changes need to be done to the package system."; + return { 'log' => @log }; + } + + my ($pService, $pAny); + foreach $pService (keys %{$todo}) + { + $pAny = ${$todo}{$pService}; + + if ( ref($pAny) ne 'HASH' ) + { + push @log, "A service returned by SuseRegister did not contain any details: $pService"; + } + elsif ( not defined $pService || $pService eq '') + { + push @log, "A service returned by SuseRegister has no or an invalid name."; + } + else + { + if ( defined ${$pAny}{'TYPE'} ) + { + if ( ${$pAny}{'TYPE'} eq 'zypp' ) + { + push @log, "Handling a service of the type zypp"; + + if ( not defined ${$pAny}{'TASK'} || ${$pAny}{'TASK'} eq '' ) + { + push @log, "A service returned by SuseRegister has an invalid task: $pService"; + } + elsif ( ${$pAny}{'TASK'} eq 'le' ) + { + push @log, "According to SuseRegister a service does not need to be changed: $pService"; + } + elsif ( ${$pAny}{'TASK'} eq 'a' ) + { + push @log, "According to SuseRegister a service has to be added: $pService"; + my @zCMD = ('zypper', '--non-interactive', 'addrepo', '--name', "${$pAny}{'NAME'}", '--refresh', "${$pAny}{'URL'}", "${$pAny}{'ALIAS'}" ); + my @zCMDopt = ('zypper', '--non-interactive', 'modifyrepo', '--enable', '--refresh', '--priority', defined ${$pAny}{'URL'} ? ${$pAny}{'URL'} : 99 , "${$pAny}{'URL'}"); + if ( system(@zCMD) == 0 && system(@zCMDopt) == 0 ) + { + push @log, "Successfully added a new service: $pService"; + } + else + { + push @log, "ERROR: Adding a new service failed: $pService"; + } + } + elsif ( ${$pAny}{'TASK'} eq 'd' ) + { + push @log, "According to SuseRegister a service has to be deleted: $pService"; + my @zCMD = ('zypper', '--non-interactive', 'removerepo', "$pService"); + if ( system(@zCMD) == 0 ) + { + push @log, "Successfully deleted a service: $pService"; + } + else + { + push @log, "ERROR: Could not delete a service: $pService"; + } + } + + } + elsif ( ${$pAny}{'TYPE'} eq 'nu' ) + { + push @log, "Handling a service of the type nu"; + + if ( not defined ${$pAny}{'TASK'} || ${$pAny}{'TASK'} eq '' ) + { + push @log, "A service returned by SuseRegister has an invalid task: $pService"; + } + elsif ( ${$pAny}{'TASK'} eq 'ld' ) + { + push @log, "According to SuseRegister a service should be left disabled: $pService"; + } + elsif ( ${$pAny}{'TASK'} eq 'le' ) + { + push @log, "According to SuseRegister a service should be left enabled: $pService"; + push @log, "Now checking the catalogs of the service: $pService"; + + my @zCMD = ('zypper', '--non-interactive', 'refresh', '--services'); + if ( system(@zCMD) == 0 ) + { + push @log, "Successfully refreshed service: $pService"; + } + else + { + push @log, "ERROR: Could not refresh service: $pService"; + } + push @log, $self->checkcatalogs( ${$pAny}{'CATALOGS'}, $pService ); + } + elsif ( ${$pAny}{'TASK'} eq 'a' ) + { + push @log, "According to SuseRegister a service has to be added: $pService"; + + my @zCMD = ('zypper', '--non-interactive', 'addservice', ${$pAny}{'URL'}."?credentials=NCCcredentials", ${$pAny}{'ALIAS'}); + if ( system(@zCMD) == 0 ) + { + push @log, "Successfully added a new service: $pService"; + + my @zCMD = ('zypper', '--non-interactive', 'modifyservice', '--refresh', $pService); + if ( system(@zCMD) == 0 ) + { + push @log, "Successfully enabled refreshing for service: $pService"; + } + else + { + push @log, "ERROR: Could not enable refreshing of service: $pService"; + } + + push @log, "Now checking the catalogs of the service: $pService"; + + my @zrCMD = ('zypper', '--non-interactive', 'refresh', '--services'); + if ( system(@zrCMD) == 0 ) + { + push @log, "Successfully refreshed service: $pService"; + } + else + { + push @log, "ERROR: Could not refresh service: $pService"; + } + push @log, $self->checkcatalogs( ${$pAny}{'CATALOGS'}, $pService ); + } + else + { + push @log, "Adding a new service failed: $pService"; + } + } + elsif ( ${$pAny}{'TASK'} eq 'd' ) + { + push @log, "According to SuseRegister a service has to be deleted: $pService"; + + my @zCMD = ('zypper', '--non-interactive', 'removeservice', $pService); + if ( system(@zCMD) ) + { + push @log, "Successfully deleted a service: $pService"; + } + else + { + push @log, "ERROR: Could not delete a service: $pService"; + } + } + } + else + { + push @log, "A service returned by SuseRegister has an unsupported type: $pService (${$pAny}{'TYPE'})"; + } + } # end defined ${$pAny}{'TYPE'} + else + { + push @log, "A service returned by SuseRegister has an invalid type"; + } + } + } # end foreach pService + + my @zCMD = ('zypper', '--non-interactive', 'refresh', '--services'); + if ( system(@zCMD) == 0 ) + { + push @log, "Successfully refreshed all services"; + } + else + { + push @log, "ERROR: Could not refresh all services"; + } + + return { 'log' => @log }; +} + + 1; ############################################################################# Modified: branches/SuSE-Code-11-SP1-Branch/registration/yast2-registration.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/regis… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/registration/yast2-registration.spec.in (original) +++ branches/SuSE-Code-11-SP1-Branch/registration/yast2-registration.spec.in Wed Jan 13 18:59:53 2010 @@ -1,4 +1,22 @@ -@HEADER-COMMENT@ +# +# spec file for package yast2-registration +# +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + +# norootforbuild + @HEADER@ Requires: yast2 >= 2.17.0 @@ -20,6 +38,7 @@ BuildArchitectures: noarch Summary: Configuration of registration +Source1: org.opensuse.yast.modules.ysr.policy %description Performs the Registration @@ -29,11 +48,10 @@ @BUILD@ @INSTALL@ -#%if %sles_version -# rm $RPM_BUILD_ROOT/%{prefix}/share/applications/YaST2/suse_register.desktop -#%else -# rm $RPM_BUILD_ROOT/%{prefix}/share/applications/YaST2/customer_center.desktop -#%endif + +mkdir -p $RPM_BUILD_ROOT/usr/share/PolicyKit/policy +install -m 0644 %SOURCE1 $RPM_BUILD_ROOT/usr/share/PolicyKit/policy/ + @CLEAN@ @@ -88,6 +106,9 @@ @fillupdir@/sysconfig.suse_register-yast2-registration @fillupdir@/sysconfig.automatic_online_update-yast2-registration +# policy files +%attr(644,root,root) %config /usr/share/PolicyKit/policy/org.opensuse.yast.modules.*.policy + %files branding-SLE %defattr(-,root,root) -- 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] r60351 - /trunk/yast2/scripts/save_y2logs
by aschnell＠svn.opensuse.org 13 Jan '10

13 Jan '10

Author: aschnell Date: Wed Jan 13 16:49:08 2010 New Revision: 60351 URL: http://svn.opensuse.org/viewcvs/yast?rev=60351&view=rev Log: - include dmesg output in logs Modified: trunk/yast2/scripts/save_y2logs Modified: trunk/yast2/scripts/save_y2logs URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/scripts/save_y2logs?rev=60… ============================================================================== --- trunk/yast2/scripts/save_y2logs (original) +++ trunk/yast2/scripts/save_y2logs Wed Jan 13 16:49:08 2010 @@ -49,6 +49,11 @@ LIST="$LIST $( cd /var/log/; ls evms-engine.*)" fi +if [ -x /bin/dmesg ]; then + dmesg > $TMPDIR/dmesg + LIST="$LIST $TMPDIR/dmesg" +fi + if [ -f /var/log/zypp/history ]; then LIST="$LIST $( cd /var/log/; ls zypp/history*)" fi -- 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] r60350 - in /trunk/storage: package/yast2-storage.changes storage/src/modules/Storage.ycp
by fehr＠svn.opensuse.org 13 Jan '10

13 Jan '10

Author: fehr Date: Wed Jan 13 14:55:23 2010 New Revision: 60350 URL: http://svn.opensuse.org/viewcvs/yast?rev=60350&view=rev Log: set fs to detected fs when format is set to false to prevent invalid fstab options (bnc #457100) Modified: trunk/storage/package/yast2-storage.changes 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 Wed Jan 13 14:55:23 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Jan 13 14:54:47 CET 2010 - fehr(a)suse.de + +- set fs to detected fs when format is set to false to prevent + invalid fstab options (bnc #457100) + +------------------------------------------------------------------- Tue Jan 12 16:51:38 CET 2010 - fehr(a)suse.de - do not forget user modified format options when FormatMount dialog 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 Jan 13 14:55:23 2010 @@ -584,11 +584,11 @@ } else if( search( device, "/dev/md" )==0 && size(ls)==2 ) { - integer pos = find(device, "p"); - if (pos == -1) - dlen = 7; - else + integer pos = search(device, "p"); + if (pos > 0) dlen = pos; + else + dlen = 7; } else if( search( device, "/dev/loop" )==0 ) { @@ -1218,9 +1218,11 @@ p["name"] = LibStorage::VolumeInfo::swig_name_get(vinfo); integer t = LibStorage::VolumeInfo::swig_fs_get(vinfo); symbol fs = toSymbol( FileSystems::conv_fs, t ); - p["detected_fs"] = fs; - if( fs != `unknown ) + if( fs!=`unknown ) p["used_fs"] = fs; + t = LibStorage::VolumeInfo::swig_detected_fs_get(vinfo); + fs = toSymbol( FileSystems::conv_fs, t ); + p["detected_fs"] = fs; boolean tbool = LibStorage::VolumeInfo::swig_format_get(vinfo); if( tbool ) p["format"] = true; @@ -1257,7 +1259,7 @@ { p["mkfs_opt"] = tmp; p["fs_options"] = - convertStringToFsOptionMap( tmp, p["detected_fs"]:`unknown, `mkfs ); + convertStringToFsOptionMap( tmp, p["used_fs"]:`unknown, `mkfs ); } else { @@ -1269,7 +1271,7 @@ { p["tunefs_opt"] = tmp; p["fs_options"] = union(p["fs_options"]:$[], - convertStringToFsOptionMap( tmp, p["detected_fs"]:`unknown, `tunefs )); + convertStringToFsOptionMap( tmp, p["used_fs"]:`unknown, `tunefs )); } tmp = LibStorage::VolumeInfo::swig_dtxt_get(vinfo); if( size(tmp)>0 ) @@ -3613,9 +3615,11 @@ (!lvm && DetectHomeFs(ret))) { ret["format"] = false; - ret["used_fs"] = ret["detected_fs"]:`unknown; - if (isempty(fstab_opts)) + if( ret["used_fs"]:`unknown!=ret["detected_fs"]:`unknown ) + { + ret["used_fs"] = ret["detected_fs"]:`unknown; fstab_opts = FileSystems::DefaultFstabOptions(ret); + } } } if( ret["format"]:false && !ret["create"]: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] r60349 - /tags/branch-Code-11-SP1-2_17_81/yast2/
by lslezak＠svn.opensuse.org 13 Jan '10

13 Jan '10

Author: lslezak Date: Wed Jan 13 14:10:16 2010 New Revision: 60349 URL: http://svn.opensuse.org/viewcvs/yast?rev=60349&view=rev Log: Created tag branch-Code-11-SP1-2_17_81 for yast2 Added: tags/branch-Code-11-SP1-2_17_81/yast2/ (props changed) - copied from r60348, branches/SuSE-Code-11-SP1-Branch/yast2/ -- 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] r60348 - in /branches/SuSE-Code-11-SP1-Branch/yast2: VERSION library/gpg/src/GPG.ycp package/yast2.changes
by lslezak＠svn.opensuse.org 13 Jan '10

13 Jan '10

Author: lslezak Date: Wed Jan 13 14:10:09 2010 New Revision: 60348 URL: http://svn.opensuse.org/viewcvs/yast?rev=60348&view=rev Log: - GPG.ycp - run gpg in C locale (bnc#544680) GPG.ycp - return success/error result in GPG::Init() and GPG::CreateKey() functions (bnc#544682) - 2.17.81 Modified: branches/SuSE-Code-11-SP1-Branch/yast2/VERSION branches/SuSE-Code-11-SP1-Branch/yast2/library/gpg/src/GPG.ycp branches/SuSE-Code-11-SP1-Branch/yast2/package/yast2.changes Modified: branches/SuSE-Code-11-SP1-Branch/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/yast2… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/yast2/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/yast2/VERSION Wed Jan 13 14:10:09 2010 @@ -1 +1 @@ -2.17.80 +2.17.81 Modified: branches/SuSE-Code-11-SP1-Branch/yast2/library/gpg/src/GPG.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/yast2… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/yast2/library/gpg/src/GPG.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/yast2/library/gpg/src/GPG.ycp Wed Jan 13 14:10:09 2010 @@ -14,6 +14,7 @@ import "String"; import "Report"; +import "FileUtils"; module "GPG"; @@ -33,8 +34,14 @@ * @param home_dir home directory for gpg (location of the keyring) * @param force unconditionaly clear the key caches */ -global void Init(string home_dir, boolean force) +global boolean Init(string home_dir, boolean force) { + if (FileUtils::IsDirectory(home_dir) != true) + { + y2error("Path %1 is not a directory", home_dir); + return false; + } + if (home_dir != home || force) { // clear the cache, home has been changed @@ -43,6 +50,8 @@ } home = home_dir; + + return true; } /** @@ -67,7 +76,7 @@ map callGPG(string options) { map ret = $[]; - string command = buildGPGcommand(options); + string command = "LC_ALL=C " + buildGPGcommand(options); ret = (map) SCR::Execute(.target.bash_output, command); @@ -241,7 +250,7 @@ * Create a new gpg key. Executes 'gpg --gen-key' in an xterm window (in the QT UI) * or in the terminal window (in the ncurses UI). */ -global void CreateKey() +global boolean CreateKey() { string xterm = "/usr/bin/xterm"; string command = buildGPGcommand("--gen-key"); @@ -249,25 +258,59 @@ y2debug("text_mode: %1", text_mode); + boolean ret = false; + if (!text_mode) { if (SCR::Read(.target.size, xterm) < 0) { // TODO FIXME Report::Error(_("Xterm is missing, install xterm package.")); + return false; } + string exit_file = ((string)SCR::Read(.target.tmpdir)) + "/gpg_tmp_exit_file"; + if (FileUtils::Exists(exit_file)) + { + SCR::Execute(.target.execute, "rm -f " + exit_file); + } + + command = "LC_ALL=C " + xterm + " -e \"" + command + "; echo $? > " + exit_file + "\""; + y2internal("Executing: %1", command); + // in Qt start GPG in a xterm window - SCR::Execute(.target.bash, xterm + " -e " + command); + SCR::Execute(.target.bash, command); + + if (FileUtils::Exists(exit_file)) + { + // read the exit code from file + // (the exit code from the SCR call above is the xterm exit code which is not what we want here) + string exit_code = (string)SCR::Read(.target.string, exit_file); + y2milestone("Read exit code from tmp file %1: %2", exit_file, exit_code); + + ret = exit_code == "0\n"; + } + else + { + y2warning("Exit file is missing, the gpg command has failed"); + ret = false; + } } else { + command = "LC_ALL=C " + command; + y2internal("Executing in terminal: %1", command); // in ncurses use UI::RunInTerminal - UI::RunInTerminal(command); + ret = UI::RunInTerminal(command) == 0; } - // invalidate cache, force reloading - Init(home, true); + if (ret) + { + // invalidate cache, force reloading + Init(home, true); + } + + return ret; } /** Modified: branches/SuSE-Code-11-SP1-Branch/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/yast2… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/yast2/package/yast2.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/yast2/package/yast2.changes Wed Jan 13 14:10:09 2010 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Tue Jan 12 11:15:45 UTC 2010 - lslezak(a)suse.cz + +- GPG.ycp - run gpg in C locale (bnc#544680) +- GPG.ycp - return success/error result in GPG::Init() and + GPG::CreateKey() functions (bnc#544682) +- 2.17.81 + +------------------------------------------------------------------- Thu Jan 7 10:43:13 CET 2010 - mvidner(a)suse.cz - YaST would not start from the GNOME menu (Unknown option -S) bnc#568424. -- 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] r60347 - /tags/stable-2_19_2/ncurses/
by kmachalkova＠svn.opensuse.org 13 Jan '10

13 Jan '10

Author: kmachalkova Date: Wed Jan 13 12:48:37 2010 New Revision: 60347 URL: http://svn.opensuse.org/viewcvs/yast?rev=60347&view=rev Log: Created tag stable-2_19_2 for ncurses Added: tags/stable-2_19_2/ncurses/ - copied from r60346, trunk/ncurses/ -- 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] r60346 - /tags/stable-2_19_2/online-update/
by jsuchome＠svn.opensuse.org 13 Jan '10

13 Jan '10

Author: jsuchome Date: Wed Jan 13 09:22:48 2010 New Revision: 60346 URL: http://svn.opensuse.org/viewcvs/yast?rev=60346&view=rev Log: Created tag stable-2_19_2 for online-update Added: tags/stable-2_19_2/online-update/ - copied from r60345, trunk/online-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] r60345 - in /trunk/online-update: VERSION package/yast2-online-update.changes src/inst_you.ycp
by jsuchome＠svn.opensuse.org 13 Jan '10

13 Jan '10

Author: jsuchome Date: Wed Jan 13 09:22:31 2010 New Revision: 60345 URL: http://svn.opensuse.org/viewcvs/yast?rev=60345&view=rev Log: - inst_you: do not run again if there's no patch left (bnc#515138) - 2.19.2 Modified: trunk/online-update/VERSION trunk/online-update/package/yast2-online-update.changes trunk/online-update/src/inst_you.ycp Modified: trunk/online-update/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/VERSION?rev=60345&… ============================================================================== --- trunk/online-update/VERSION (original) +++ trunk/online-update/VERSION Wed Jan 13 09:22:31 2010 @@ -1 +1 @@ -2.19.1 +2.19.2 Modified: trunk/online-update/package/yast2-online-update.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/package/yast2-onli… ============================================================================== --- trunk/online-update/package/yast2-online-update.changes (original) +++ trunk/online-update/package/yast2-online-update.changes Wed Jan 13 09:22:31 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Jan 13 09:20:17 CET 2010 - jsuchome(a)suse.cz + +- inst_you: do not run again if there's no patch left (bnc#515138) +- 2.19.2 + +------------------------------------------------------------------- Wed Jan 13 08:33:11 CET 2010 - jsuchome(a)suse.cz - call inst_suse_register if no update repo is present (bnc#565094) Modified: trunk/online-update/src/inst_you.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update/src/inst_you.ycp?r… ============================================================================== --- trunk/online-update/src/inst_you.ycp (original) +++ trunk/online-update/src/inst_you.ycp Wed Jan 13 09:22:31 2010 @@ -310,7 +310,16 @@ else if (ret == `restart_same_step) { Popup::Message (OnlineUpdate::restart_message); - SCR::Write (.target.ycp, restarted_path, 1); + if (more_patches_needed) + { + y2milestone ("restarting YaST, expecting another patches in the next YOU run"); + SCR::Write (.target.ycp, restarted_path, 1); + } + else + { + y2milestone ("restarting YaST, but there are no patches for the next YOU run"); + ret = `restart_yast; + } } if (!already_up) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0