Mercurial Repositories > eric / file comparison
comparison: Project/Project.py
Project/Project.py
- changeset 2798
- c349fa5fe7c0
- parent 2796
- 3584161f55e7
- child 2847
- 1843ef6e2656
- child 2853
- 0866c3aac79f
equal
deleted
inserted
replaced
| 2796:3584161f55e7 | 2798:c349fa5fe7c0 |
|---|---|
| 4249 icon=E5MessageBox.Warning) | 4249 icon=E5MessageBox.Warning) |
| 4250 if not res: | 4250 if not res: |
| 4251 return # don't overwrite | 4251 return # don't overwrite |
| 4252 | 4252 |
| 4253 # build the list of entries | 4253 # build the list of entries |
| 4254 lst = [] | 4254 lst_ = [] |
| 4255 for key in \ | 4255 for key in \ |
| 4256 ["SOURCES", "FORMS", "RESOURCES", "TRANSLATIONS", "INTERFACES", "OTHERS"]: | 4256 ["SOURCES", "FORMS", "RESOURCES", "TRANSLATIONS", "INTERFACES", "OTHERS"]: |
| 4257 lst.extend(self.pdata[key]) | 4257 lst_.extend(self.pdata[key]) |
| 4258 lst = [] | |
| 4259 for entry in lst_: | |
| 4260 if os.path.isdir(self.getAbsolutePath(entry)): | |
| 4261 lst.extend([self.getRelativePath(p) for p in | |
| 4262 Utilities.direntries(self.getAbsolutePath(entry), True)]) | |
| 4263 continue | |
| 4264 else: | |
| 4265 lst.append(entry) | |
| 4258 lst.sort() | 4266 lst.sort() |
| 4259 if "PKGLIST" in lst: | 4267 if "PKGLIST" in lst: |
| 4260 lst.remove("PKGLIST") | 4268 lst.remove("PKGLIST") |
| 4261 | 4269 |
| 4262 # write the file | 4270 # write the file |
