Skip to content

Commit

Permalink
[#1704 state:resolved] fix for iTunes 10 which breaks prereq. switche…
Browse files Browse the repository at this point in the history
…d to reading the version directly from the version.plist in iTunes.app
  • Loading branch information
Jeff Haynie committed Sep 2, 2010
1 parent 8e3b1e0 commit be36b9d
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions support/iphone/prereq.py
Expand Up @@ -70,13 +70,15 @@ def check_iphone3():
sys.exit(1)

def check_itunes_version(props):
ver = run.run(['osascript',os.path.join(template_dir,'itunes_ver.scpt')],False,False).strip()
ver = run.run(['/usr/libexec/PlistBuddy','-c','Print :CFBundleVersion','/Applications/iTunes.app/Contents/version.plist'],True,False)

This comment has been minimized.

Copy link
@sprohaszka

sprohaszka Sep 3, 2010

It shouldn't be 'Print:CFBundleVersion' without a space ?

ver = ver.strip()
props['itunes_version']=ver
props['itunes']=False
props['itunes_message']=None
if ver:
major = int(ver[0])
minor = int(ver[2])
toks = ver.split('.')
major = toks[0]
minor = toks[1]
if (major == 8 and minor >= 2) or major > 8:
props['itunes']=True
return
Expand Down

3 comments on commit be36b9d

@nicjohnson
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You are the man. That was lightning-fast! Works great.

@jhaynie
Copy link
Contributor

@jhaynie jhaynie commented on be36b9d Sep 2, 2010

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Haha. thanks. Try our best... :)

@davros
Copy link

@davros davros commented on be36b9d Sep 6, 2010

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I assume that you add the lines starting with "-" and remove the lines starting with '+' ????
David

Please sign in to comment.