|
Lines 5612-5619
Link Here
|
| 5612 |
mypath = os.path.join("All", myfile) |
5612 |
mypath = os.path.join("All", myfile) |
| 5613 |
dest_path = os.path.join(self.pkgdir, mypath) |
5613 |
dest_path = os.path.join(self.pkgdir, mypath) |
| 5614 |
if os.path.exists(dest_path): |
5614 |
if os.path.exists(dest_path): |
| 5615 |
other_cat = xpak.tbz2(dest_path).getfile("CATEGORY").strip() |
5615 |
# For invalid packages, other_cat could be None. |
|
|
5616 |
other_cat = xpak.tbz2(dest_path).getfile("CATEGORY") |
| 5616 |
if other_cat: |
5617 |
if other_cat: |
|
|
5618 |
other_cat = other_cat.strip() |
| 5617 |
self._move_from_all(other_cat + "/" + mypkg) |
5619 |
self._move_from_all(other_cat + "/" + mypkg) |
| 5618 |
"""The file may or may not exist. Move it if necessary and update |
5620 |
"""The file may or may not exist. Move it if necessary and update |
| 5619 |
internal state for future calls to getname().""" |
5621 |
internal state for future calls to getname().""" |
|
Lines 5680-5686
Link Here
|
| 5680 |
if os.path.islink(full_path): |
5682 |
if os.path.islink(full_path): |
| 5681 |
continue |
5683 |
continue |
| 5682 |
mytbz2 = xpak.tbz2(full_path) |
5684 |
mytbz2 = xpak.tbz2(full_path) |
| 5683 |
mycat = mytbz2.getfile("CATEGORY").strip() |
5685 |
# For invalid packages, mycat could be None. |
|
|
5686 |
mycat = mytbz2.getfile("CATEGORY") |
| 5684 |
mypkg = myfile[:-5] |
5687 |
mypkg = myfile[:-5] |
| 5685 |
if not mycat: |
5688 |
if not mycat: |
| 5686 |
#old-style or corrupt package |
5689 |
#old-style or corrupt package |
|
Lines 5690-5695
Link Here
|
| 5690 |
"recoverable and should be deleted.\n", |
5693 |
"recoverable and should be deleted.\n", |
| 5691 |
noiselevel=-1) |
5694 |
noiselevel=-1) |
| 5692 |
self.invalids.append(mypkg) |
5695 |
self.invalids.append(mypkg) |
|
|
5696 |
continue |
| 5697 |
mycat = mycat.strip() |
| 5693 |
if mycat != mydir and mydir != "All": |
5698 |
if mycat != mydir and mydir != "All": |
| 5694 |
continue |
5699 |
continue |
| 5695 |
if mypkg != mytbz2.getfile("PF").strip(): |
5700 |
if mypkg != mytbz2.getfile("PF").strip(): |
