[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    qt-copy
From:       Christian Ehrlicher <Ch.Ehrlicher () gmx ! de>
Date:       2009-02-06 17:50:17
Message-ID: 1233942617.155347.20041.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 922321 by chehrlic:

honor patches/DISABLED

 M  +19 -5     apply_patches.py  


--- trunk/qt-copy/apply_patches.py #922320:922321
@@ -25,18 +25,31 @@
     if( os.path.exists( ".applied_patches" ) ):
         f = open( ".applied_patches", "rb" )
         for line in f:
-            patches_applied.append( line.strip() )
+            patches_applied.append( line[:4] )
             if verbose:
                 print "patches_applied: " + line.strip()
         f.close()
     return sorted(patches_applied)
 
-def get_patches_to_apply( patches, patches_applied ):
+def list_disabled_patches():
+    disabled = list()
+    if( os.path.exists( "patches/DISABLED" ) ):
+        f = open( "patches/DISABLED", "rb" )
+        for line in f:
+            if line[0] != '#':
+                disabled.append( line[:4] )
+                if verbose:
+                    print "disabled patch: " + line.strip()
+        f.close()
+    return sorted(disabled)
+
+def get_patches_to_apply( patches, patches_dontuse ):
     patches_to_apply = list()
     for patch in patches:
-        if patch in patches_applied:
+        number = patch[:4]
+        if number in patches_dontuse:
             if verbose:
-                print "already applied: " + patch
+                print "already applied or disabled: " + patch
         else:
             patches_to_apply.append( patch )
     return patches_to_apply
@@ -90,7 +103,8 @@
 
 patches = list_patches()
 patches_applied = list_applied_patches()
-patches_to_apply = get_patches_to_apply( patches, patches_applied )
+patches_disabled = list_disabled_patches()
+patches_to_apply = get_patches_to_apply( patches, patches_applied + patches_disabled )
 apply_patches( patches_to_apply )
 
 exit( 0 )
[prev in list] [next in list] [prev in thread] [next in thread]