Merge pull request #46 from yast/saffer_remove_junk

less aggresive remove_junk script
yast · Jun 1, 2015 · 0def20e · 0def20e
2 parents f3c790e + 98a1193
commit 0def20e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/package/yast2-update.changes b/package/yast2-update.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Jun  1 08:43:53 UTC 2015 - jreidinger@suse.com
+
+- make junk_cleaner less aggresive to not remove important files
+  (fate#317900)
+- 3.1.31
+
 -------------------------------------------------------------------
 Fri May 29 14:58:19 UTC 2015 - jreidinger@suse.com
 

diff --git a/package/yast2-update.spec b/package/yast2-update.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-update
-Version:        3.1.30
+Version:        3.1.31
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/bin/remove_junk b/src/bin/remove_junk
@@ -1,13 +1,15 @@
 #!/bin/bash
 
+# remove old YaST directory from YaST1 era
 if test -d $1/var/lib/YaST ; then
     /bin/rm -fr $1/var/lib/YaST
 fi
 
 if test -d $1/var/lib/YaST2 ; then
-    /usr/bin/find $1/var/lib/YaST2 -name "*" -a -type f -a \( -name "users.ycp" -prune -o -exec rm -f -- {} \; \)
+  # place here files from dropped modules
 fi
 
+# remove old you stuff which can be quite big
 if test -d $1/var/lib/YaST2/you ; then
     /bin/rm -f $1/var/lib/YaST2/you/quickcheck
     /bin/rm -fr $1/var/lib/YaST2/you/{files,installed,mnt,scripts}