Hello community,

here is the log from the commit of package yast2-samba-client for 
openSUSE:Leap:15.2 checked in at 2020-03-19 08:35:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/yast2-samba-client (Old)
 and      /work/SRC/openSUSE:Leap:15.2/.yast2-samba-client.new.3160 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "yast2-samba-client"

Thu Mar 19 08:35:50 2020 rev:24 rq:786015 version:4.2.3

Changes:
--------
--- /work/SRC/openSUSE:Leap:15.2/yast2-samba-client/yast2-samba-client.changes  
2020-01-15 16:32:21.424883235 +0100
+++ 
/work/SRC/openSUSE:Leap:15.2/.yast2-samba-client.new.3160/yast2-samba-client.changes
        2020-03-19 08:35:55.709834052 +0100
@@ -1,0 +2,7 @@
+Wed Jan 15 11:38:38 UTC 2020 - Samuel Cabrero <[email protected]>
+
+- Do not stop nmbd while nmbstatus is running, it is not necessary
+  anymore; (bsc#1158916);
+- 4.2.3
+
+-------------------------------------------------------------------

Old:
----
  yast2-samba-client-4.2.2.tar.bz2

New:
----
  yast2-samba-client-4.2.3.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-samba-client.spec ++++++
--- /var/tmp/diff_new_pack.CosAn0/_old  2020-03-19 08:35:56.813834727 +0100
+++ /var/tmp/diff_new_pack.CosAn0/_new  2020-03-19 08:35:56.817834729 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package yast2-samba-client
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-samba-client
-Version:        4.2.2
+Version:        4.2.3
 Release:        0
 Summary:        YaST2 - Samba Client Configuration
 License:        GPL-2.0-only

++++++ yast2-samba-client-4.2.2.tar.bz2 -> yast2-samba-client-4.2.3.tar.bz2 
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/yast2-samba-client-4.2.2/package/yast2-samba-client.changes 
new/yast2-samba-client-4.2.3/package/yast2-samba-client.changes
--- old/yast2-samba-client-4.2.2/package/yast2-samba-client.changes     
2019-06-04 17:19:38.000000000 +0200
+++ new/yast2-samba-client-4.2.3/package/yast2-samba-client.changes     
2020-03-16 18:21:09.000000000 +0100
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Wed Jan 15 11:38:38 UTC 2020 - Samuel Cabrero <[email protected]>
+
+- Do not stop nmbd while nmbstatus is running, it is not necessary
+  anymore; (bsc#1158916);
+- 4.2.3
+
+-------------------------------------------------------------------
 Fri May 31 12:37:40 UTC 2019 - Stasiek Michalski <[email protected]>
 
 - Add metainfo (fate#319035)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/yast2-samba-client-4.2.2/package/yast2-samba-client.spec 
new/yast2-samba-client-4.2.3/package/yast2-samba-client.spec
--- old/yast2-samba-client-4.2.2/package/yast2-samba-client.spec        
2019-06-04 17:19:38.000000000 +0200
+++ new/yast2-samba-client-4.2.3/package/yast2-samba-client.spec        
2020-03-16 18:21:09.000000000 +0100
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-samba-client
-Version:        4.2.2
+Version:        4.2.3
 Release:        0
 Summary:        YaST2 - Samba Client Configuration
 Group:          System/YaST
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/yast2-samba-client-4.2.2/src/modules/SambaNmbLookup.pm 
new/yast2-samba-client-4.2.3/src/modules/SambaNmbLookup.pm
--- old/yast2-samba-client-4.2.2/src/modules/SambaNmbLookup.pm  2019-06-04 
17:19:38.000000000 +0200
+++ new/yast2-samba-client-4.2.3/src/modules/SambaNmbLookup.pm  2020-03-16 
18:21:09.000000000 +0100
@@ -41,11 +41,6 @@
 
 our $Nmbstatus_available;
 
-# Flag, if we should restart nmbd after finishing nmbstatus.
-# nmbd must be stopped, when doing nmbstatus, otherwise only
-# local host is shown.
-our $Nmbd_was_running;
-
 # ID of NMBSTATUS_EXE process, as returend from .process agent (NOT its PID)
 our $process_id;
 
@@ -65,14 +60,6 @@
        return FALSE;
     }
 
-    # first, check if nmbd is running
-    if (PackageSystem->Installed("samba") && Service->Status("nmb")==0) {
-        $Nmbd_was_running = 1;
-        y2debug("Stopping nmbd for nmbstatus");
-        # FIXME: we should check, if stop did not fail
-        Service->Stop("nmb");
-    }
-    
     # start nmbstatus
     my $out = SCR->Execute(".target.bash_output", "/usr/bin/id --user");
     my $cmd    = NMBSTATUS_EXE;
@@ -85,12 +72,6 @@
     if(!$Nmbstatus_running) {
         y2error ("Cannot start nmbstatus (shell returned $Nmbstatus_running)");
         $Nmbstatus_available = 0;
-        # restore nmbd
-        if ($Nmbd_was_running) {
-           y2debug("Restarting nmbd for nmbstatus");
-           Service->Start("nmb");
-           $Nmbd_was_running = 0;
-       }
        return FALSE;
     }
     
@@ -147,13 +128,6 @@
                $Nmbstatus_output{$current_group}{uc $1} = uc $2;
            }
        }
-       
-       # restore nmbd
-       if ($Nmbd_was_running) {
-           y2debug("Restarting nmbd for nmbstatus");
-           Service->Start("nmb");
-           $Nmbd_was_running = 0;
-       }
     }
 }
 


Reply via email to