summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorMatthieu Patou <mat@matws.net>2011-08-25 18:05:28 +0200
committerMatthieu Patou <mat@samba.org>2012-01-03 06:47:10 +0100
commit3213d1e0b770690b1a964f38fb57ebbcd8ce0746 (patch)
tree177da89aab1723c5eb8f0c1a84ad35a30c71e1e0 /source4
parent90f06d69f02072d7b76fe2fa80963d6bf82c2bae (diff)
downloadsamba-3213d1e0b770690b1a964f38fb57ebbcd8ce0746.tar.gz
samba-3213d1e0b770690b1a964f38fb57ebbcd8ce0746.tar.bz2
samba-3213d1e0b770690b1a964f38fb57ebbcd8ce0746.zip
upgradeprovision: treat provision without oem attribute as quite recent, it's provision that comes from Windows replication
Diffstat (limited to 'source4')
-rwxr-xr-xsource4/scripting/bin/upgradeprovision2
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/scripting/bin/upgradeprovision b/source4/scripting/bin/upgradeprovision
index f4031206c9..35e469693c 100755
--- a/source4/scripting/bin/upgradeprovision
+++ b/source4/scripting/bin/upgradeprovision
@@ -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