mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-04-23 04:59:17 -05:00
Code Issues Packages Projects Releases Wiki Activity

pylint cleanups: mark unused variables.

Browse Source 
git-svn-id: http://munki.googlecode.com/svn/trunk@749 a4e17f2e-e282-11dd-95e1-755cbddbdd66
This commit is contained in:
Greg Neagle
2010-09-13 17:34:47 +00:00
parent 231e309ae4
commit eceedc0e86
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/client/munkilib/adobeutils.py
+15 -15
View File
@@ -159,7 +159,7 @@ def getAdobeSetupInfo(installroot):
payloads = []
# look for a payloads folder
for (path, dirs, files) in os.walk(installroot):
for (path, unused_dirs, unused_files) in os.walk(installroot):
if path.endswith("/payloads"):
driverfolder = ''
mediaSignature = ''
@@ -202,7 +202,7 @@ def getAdobeSetupInfo(installroot):
if not payloads:
# look for an extensions folder; almost certainly this is an Updater
for (path, dirs, files) in os.walk(installroot):
for (path, unused_dirs, unused_files) in os.walk(installroot):
if path.endswith("/extensions"):
for item in os.listdir(path):
#skip LanguagePacks
@@ -289,7 +289,7 @@ def getAdobeInstallLog():
proc = subprocess.Popen(['/bin/ls', '-t1', logpath],
bufsize=1, stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
(output, err) = proc.communicate()
(output, unused_err) = proc.communicate()
if output:
firstitem = str(output).splitlines()[0]
if firstitem.endswith(".log"):
@@ -317,7 +317,7 @@ def getAdobeInstallProgressInfo(previous_completedpayloads,
proc = subprocess.Popen(cmd, bufsize=1,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
(output, err) = proc.communicate()
(output, unused_err) = proc.communicate()
if output:
try:
completedpayloads = int(str(output).rstrip("\n"))
@@ -332,7 +332,7 @@ def getAdobeInstallProgressInfo(previous_completedpayloads,
proc = subprocess.Popen(cmd, bufsize=1,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
(output, err) = proc.communicate()
(output, unused_err) = proc.communicate()
if output:
# start with the last line of the output
# and work backwards until we find a name
@@ -388,7 +388,7 @@ def getPercent(current, maximum):
def findSetupApp(dirpath):
'''Search dirpath and enclosed directories for Setup.app.
Returns the path to the actual executable.'''
for (path, dirs, files) in os.walk(dirpath):
for (path, unused_dirs, unused_files) in os.walk(dirpath):
if path.endswith("Setup.app"):
setup_path = os.path.join(path, "Contents", "MacOS", "Setup")
if os.path.exists(setup_path):
@@ -399,7 +399,7 @@ def findSetupApp(dirpath):
def findInstallApp(dirpath):
'''Searches dirpath and enclosed directories for Install.app.
Returns the path to the actual executable.'''
for (path, dirs, files) in os.walk(dirpath):
for (path, unused_dirs, unused_files) in os.walk(dirpath):
if path.endswith("Install.app"):
setup_path = os.path.join(path, "Contents", "MacOS", "Install")
if os.path.exists(setup_path):
@@ -410,7 +410,7 @@ def findInstallApp(dirpath):
def findAdobePatchInstallerApp(dirpath):
'''Searches dirpath and enclosed directories for AdobePatchInstaller.app.
Returns the path to the actual executable.'''
for (path, dirs, files) in os.walk(dirpath):
for (path, unused_dirs, unused_files) in os.walk(dirpath):
if path.endswith("AdobePatchInstaller.app"):
setup_path = os.path.join(path, "Contents", "MacOS",
"AdobePatchInstaller")
@@ -422,7 +422,7 @@ def findAdobePatchInstallerApp(dirpath):
def findAdobeDeploymentManager(dirpath):
'''Searches dirpath and enclosed directories for AdobeDeploymentManager.
Returns path to the executable.'''
for (path, dirs, files) in os.walk(dirpath):
for (path, unused_dirs, unused_files) in os.walk(dirpath):
if path.endswith("pkg/Contents/Resources"):
dm_path = os.path.join(path, "AdobeDeploymentManager")
if os.path.exists(dm_path):
@@ -437,7 +437,7 @@ def getPID(processname):
stdin=subprocess.PIPE,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
(out, err) = proc.communicate()
(out, unused_err) = proc.communicate()
lines = str(out).splitlines()
for line in lines:
(pid, process) = line.split(None, 1)
@@ -695,7 +695,7 @@ def runAdobeCS5AAMEEInstall(dmgpath):
retcode = runAdobeInstallTool(cmd, number_of_payloads,
killAdobeAIR=True)
# now clean up our symlink hackfest
ignoreresult = subprocess.call(["/bin/rm", "-rf", tmpdir])
unused_result = subprocess.call(["/bin/rm", "-rf", tmpdir])
else:
munkicommon.display_error(
"%s doesn't appear to contain AdobeDeploymentManager" %
@@ -727,7 +727,7 @@ def runAdobeCS5PatchInstaller(dmgpath, copylocal=False):
return -1
# remove the dmg file to free up space, since we don't need it
# any longer
ignoreresult = subprocess.call(["/bin/rm", dmgpath])
unused_result = subprocess.call(["/bin/rm", dmgpath])
else:
updatedir = mountpoints[0]
@@ -749,7 +749,7 @@ def runAdobeCS5PatchInstaller(dmgpath, copylocal=False):
retcode = -1
if copylocal:
# clean up our mess
ignoreresult = subprocess.call(["/bin/rm", "-rf", updatedir])
unused_result = subprocess.call(["/bin/rm", "-rf", updatedir])
else:
munkicommon.unmountdmg(mountpoints[0])
return retcode
@@ -823,7 +823,7 @@ def getAppData():
stdin=subprocess.PIPE,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
(pliststr, err) = proc.communicate()
(pliststr, unused_err) = proc.communicate()
if proc.returncode == 0:
plist = FoundationPlist.readPlistFromString(pliststr)
# top level is an array instead of a dict, so get dict
@@ -856,7 +856,7 @@ def findAcrobatPatchApp(dirpath):
in dirpath. If found, returns the path to the bundled
patching script.'''
for (path, dirs, files) in os.walk(dirpath):
for (path, unused_dirs, unused_files) in os.walk(dirpath):
if path.endswith(".app"):
# look for Adobe's patching script
patch_script_path = os.path.join(path, "Contents", "Resources",