upgradeprovision: treat provision without oem attribute as quite recent, it's provisi...
authorMatthieu Patou <mat@matws.net>
Thu, 25 Aug 2011 16:05:28 +0000 (18:05 +0200)
committerMatthieu Patou <mat@samba.org>
Tue, 3 Jan 2012 05:47:10 +0000 (06:47 +0100)
source4/scripting/bin/upgradeprovision

index f4031206c9d2e6e70bce43bd2567161ba587d1f1..35e469693c4631ee2914d7740e6f50774e6a1a12 100755 (executable)
@@ -1805,7 +1805,7 @@ if __name__ == '__main__':
             deltaattr = None
         # 11)
             message(GUESS, oem)
-            if hasATProvision(ldbs.sam) or re.match(".*alpha((9)|(\d\d+)).*", str(oem)):
+            if oem is None or hasATProvision(ldbs.sam) or re.match(".*alpha((9)|(\d\d+)).*", str(oem)):
                 # 11) A
                 # Starting from alpha9 we can consider that the structure is quite ok
                 # and that we should do only dela