diff options
Diffstat (limited to 'bitbake/lib')
-rw-r--r-- | bitbake/lib/bb/fetch/bzr.py | 6 | ||||
-rw-r--r-- | bitbake/lib/bb/fetch2/bzr.py | 6 | ||||
-rw-r--r-- | bitbake/lib/bb/fetch2/hg.py | 8 | ||||
-rw-r--r-- | bitbake/lib/bb/fetch2/osc.py | 4 | ||||
-rw-r--r-- | bitbake/lib/bb/fetch2/svn.py | 6 | ||||
-rw-r--r-- | bitbake/lib/bb/runqueue.py | 4 |
6 files changed, 17 insertions, 17 deletions
diff --git a/bitbake/lib/bb/fetch/bzr.py b/bitbake/lib/bb/fetch/bzr.py index 9bde706df8..85a92940e6 100644 --- a/bitbake/lib/bb/fetch/bzr.py +++ b/bitbake/lib/bb/fetch/bzr.py | |||
@@ -67,15 +67,15 @@ class Bzr(Fetch): | |||
67 | 67 | ||
68 | options = [] | 68 | options = [] |
69 | 69 | ||
70 | if command is "revno": | 70 | if command == "revno": |
71 | bzrcmd = "%s revno %s %s://%s" % (basecmd, " ".join(options), proto, bzrroot) | 71 | bzrcmd = "%s revno %s %s://%s" % (basecmd, " ".join(options), proto, bzrroot) |
72 | else: | 72 | else: |
73 | if ud.revision: | 73 | if ud.revision: |
74 | options.append("-r %s" % ud.revision) | 74 | options.append("-r %s" % ud.revision) |
75 | 75 | ||
76 | if command is "fetch": | 76 | if command == "fetch": |
77 | bzrcmd = "%s co %s %s://%s" % (basecmd, " ".join(options), proto, bzrroot) | 77 | bzrcmd = "%s co %s %s://%s" % (basecmd, " ".join(options), proto, bzrroot) |
78 | elif command is "update": | 78 | elif command == "update": |
79 | bzrcmd = "%s pull %s --overwrite" % (basecmd, " ".join(options)) | 79 | bzrcmd = "%s pull %s --overwrite" % (basecmd, " ".join(options)) |
80 | else: | 80 | else: |
81 | raise FetchError("Invalid bzr command %s" % command) | 81 | raise FetchError("Invalid bzr command %s" % command) |
diff --git a/bitbake/lib/bb/fetch2/bzr.py b/bitbake/lib/bb/fetch2/bzr.py index 201705b6ce..04a9087c11 100644 --- a/bitbake/lib/bb/fetch2/bzr.py +++ b/bitbake/lib/bb/fetch2/bzr.py | |||
@@ -64,15 +64,15 @@ class Bzr(FetchMethod): | |||
64 | 64 | ||
65 | options = [] | 65 | options = [] |
66 | 66 | ||
67 | if command is "revno": | 67 | if command == "revno": |
68 | bzrcmd = "%s revno %s %s://%s" % (basecmd, " ".join(options), proto, bzrroot) | 68 | bzrcmd = "%s revno %s %s://%s" % (basecmd, " ".join(options), proto, bzrroot) |
69 | else: | 69 | else: |
70 | if ud.revision: | 70 | if ud.revision: |
71 | options.append("-r %s" % ud.revision) | 71 | options.append("-r %s" % ud.revision) |
72 | 72 | ||
73 | if command is "fetch": | 73 | if command == "fetch": |
74 | bzrcmd = "%s co %s %s://%s" % (basecmd, " ".join(options), proto, bzrroot) | 74 | bzrcmd = "%s co %s %s://%s" % (basecmd, " ".join(options), proto, bzrroot) |
75 | elif command is "update": | 75 | elif command == "update": |
76 | bzrcmd = "%s pull %s --overwrite" % (basecmd, " ".join(options)) | 76 | bzrcmd = "%s pull %s --overwrite" % (basecmd, " ".join(options)) |
77 | else: | 77 | else: |
78 | raise FetchError("Invalid bzr command %s" % command, ud.url) | 78 | raise FetchError("Invalid bzr command %s" % command, ud.url) |
diff --git a/bitbake/lib/bb/fetch2/hg.py b/bitbake/lib/bb/fetch2/hg.py index 35a4b3c30a..f2719d4f9e 100644 --- a/bitbake/lib/bb/fetch2/hg.py +++ b/bitbake/lib/bb/fetch2/hg.py | |||
@@ -92,21 +92,21 @@ class Hg(FetchMethod): | |||
92 | else: | 92 | else: |
93 | hgroot = ud.user + "@" + host + ud.path | 93 | hgroot = ud.user + "@" + host + ud.path |
94 | 94 | ||
95 | if command is "info": | 95 | if command == "info": |
96 | return "%s identify -i %s://%s/%s" % (basecmd, proto, hgroot, ud.module) | 96 | return "%s identify -i %s://%s/%s" % (basecmd, proto, hgroot, ud.module) |
97 | 97 | ||
98 | options = []; | 98 | options = []; |
99 | if ud.revision: | 99 | if ud.revision: |
100 | options.append("-r %s" % ud.revision) | 100 | options.append("-r %s" % ud.revision) |
101 | 101 | ||
102 | if command is "fetch": | 102 | if command == "fetch": |
103 | cmd = "%s clone %s %s://%s/%s %s" % (basecmd, " ".join(options), proto, hgroot, ud.module, ud.module) | 103 | cmd = "%s clone %s %s://%s/%s %s" % (basecmd, " ".join(options), proto, hgroot, ud.module, ud.module) |
104 | elif command is "pull": | 104 | elif command == "pull": |
105 | # do not pass options list; limiting pull to rev causes the local | 105 | # do not pass options list; limiting pull to rev causes the local |
106 | # repo not to contain it and immediately following "update" command | 106 | # repo not to contain it and immediately following "update" command |
107 | # will crash | 107 | # will crash |
108 | cmd = "%s pull" % (basecmd) | 108 | cmd = "%s pull" % (basecmd) |
109 | elif command is "update": | 109 | elif command == "update": |
110 | cmd = "%s update -C %s" % (basecmd, " ".join(options)) | 110 | cmd = "%s update -C %s" % (basecmd, " ".join(options)) |
111 | else: | 111 | else: |
112 | raise FetchError("Invalid hg command %s" % command, ud.url) | 112 | raise FetchError("Invalid hg command %s" % command, ud.url) |
diff --git a/bitbake/lib/bb/fetch2/osc.py b/bitbake/lib/bb/fetch2/osc.py index 7c4c90c715..a16a53e544 100644 --- a/bitbake/lib/bb/fetch2/osc.py +++ b/bitbake/lib/bb/fetch2/osc.py | |||
@@ -68,9 +68,9 @@ class Osc(FetchMethod): | |||
68 | 68 | ||
69 | coroot = self._strip_leading_slashes(ud.path) | 69 | coroot = self._strip_leading_slashes(ud.path) |
70 | 70 | ||
71 | if command is "fetch": | 71 | if command == "fetch": |
72 | osccmd = "%s %s co %s/%s %s" % (basecmd, config, coroot, ud.module, " ".join(options)) | 72 | osccmd = "%s %s co %s/%s %s" % (basecmd, config, coroot, ud.module, " ".join(options)) |
73 | elif command is "update": | 73 | elif command == "update": |
74 | osccmd = "%s %s up %s" % (basecmd, config, " ".join(options)) | 74 | osccmd = "%s %s up %s" % (basecmd, config, " ".join(options)) |
75 | else: | 75 | else: |
76 | raise FetchError("Invalid osc command %s" % command, ud.url) | 76 | raise FetchError("Invalid osc command %s" % command, ud.url) |
diff --git a/bitbake/lib/bb/fetch2/svn.py b/bitbake/lib/bb/fetch2/svn.py index 607bdd0cd4..fa6c654d3e 100644 --- a/bitbake/lib/bb/fetch2/svn.py +++ b/bitbake/lib/bb/fetch2/svn.py | |||
@@ -85,7 +85,7 @@ class Svn(FetchMethod): | |||
85 | if ud.pswd: | 85 | if ud.pswd: |
86 | options.append("--password %s" % ud.pswd) | 86 | options.append("--password %s" % ud.pswd) |
87 | 87 | ||
88 | if command is "info": | 88 | if command == "info": |
89 | svncmd = "%s info %s %s://%s/%s/" % (basecmd, " ".join(options), proto, svnroot, ud.module) | 89 | svncmd = "%s info %s %s://%s/%s/" % (basecmd, " ".join(options), proto, svnroot, ud.module) |
90 | else: | 90 | else: |
91 | suffix = "" | 91 | suffix = "" |
@@ -93,9 +93,9 @@ class Svn(FetchMethod): | |||
93 | options.append("-r %s" % ud.revision) | 93 | options.append("-r %s" % ud.revision) |
94 | suffix = "@%s" % (ud.revision) | 94 | suffix = "@%s" % (ud.revision) |
95 | 95 | ||
96 | if command is "fetch": | 96 | if command == "fetch": |
97 | svncmd = "%s co %s %s://%s/%s%s %s" % (basecmd, " ".join(options), proto, svnroot, ud.module, suffix, ud.module) | 97 | svncmd = "%s co %s %s://%s/%s%s %s" % (basecmd, " ".join(options), proto, svnroot, ud.module, suffix, ud.module) |
98 | elif command is "update": | 98 | elif command == "update": |
99 | svncmd = "%s update %s" % (basecmd, " ".join(options)) | 99 | svncmd = "%s update %s" % (basecmd, " ".join(options)) |
100 | else: | 100 | else: |
101 | raise FetchError("Invalid svn command %s" % command, ud.url) | 101 | raise FetchError("Invalid svn command %s" % command, ud.url) |
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py index 3773ec0e1e..dcb2e0a86b 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/lib/bb/runqueue.py | |||
@@ -929,7 +929,7 @@ class RunQueue: | |||
929 | 929 | ||
930 | if self.state is runQueuePrepare: | 930 | if self.state is runQueuePrepare: |
931 | self.rqexe = RunQueueExecuteDummy(self) | 931 | self.rqexe = RunQueueExecuteDummy(self) |
932 | if self.rqdata.prepare() is 0: | 932 | if self.rqdata.prepare() == 0: |
933 | self.state = runQueueComplete | 933 | self.state = runQueueComplete |
934 | else: | 934 | else: |
935 | self.state = runQueueSceneInit | 935 | self.state = runQueueSceneInit |
@@ -1018,7 +1018,7 @@ class RunQueueExecute: | |||
1018 | collect the process exit codes and close the information pipe. | 1018 | collect the process exit codes and close the information pipe. |
1019 | """ | 1019 | """ |
1020 | result = os.waitpid(-1, os.WNOHANG) | 1020 | result = os.waitpid(-1, os.WNOHANG) |
1021 | if result[0] is 0 and result[1] is 0: | 1021 | if result[0] == 0 and result[1] == 0: |
1022 | return None | 1022 | return None |
1023 | task = self.build_pids[result[0]] | 1023 | task = self.build_pids[result[0]] |
1024 | del self.build_pids[result[0]] | 1024 | del self.build_pids[result[0]] |