diff options
| author | James Meyer <james.meyer@operamail.com> | 2013-01-10 22:12:37 (GMT) |
|---|---|---|
| committer | James Meyer <james.meyer@operamail.com> | 2013-01-10 22:12:37 (GMT) |
| commit | 8730ff5dfffcb615d4aeebbba08127f681fe2d93 (patch) | |
| tree | e9f8f55eb5cec41053f38fe6aa496b924f38171b /build_tools/bin | |
| parent | 21e0cfadb17a1a90a94a537520bc3737c43a78ce (diff) | |
| download | linhes_dev-8730ff5dfffcb615d4aeebbba08127f681fe2d93.zip | |
bunch of little changes/tweaks to bring the cd build up to snuff.
Diffstat (limited to 'build_tools/bin')
| -rwxr-xr-x | build_tools/bin/mpv2.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/build_tools/bin/mpv2.py b/build_tools/bin/mpv2.py index bcbbfec..b21ed29 100755 --- a/build_tools/bin/mpv2.py +++ b/build_tools/bin/mpv2.py @@ -546,7 +546,9 @@ class Packagefile(object): print " Package file:",self.TOTALPKG # Remove old package(s) from local copy - oldpkgcheck = re.compile( i + "-" + self.epoch + '(pkgver|[\d.]+)' + "-" + '(?!pkgrel)' ) + #print i + "-" + self.epoch + '(pkgver|[\d.]+)' + "-" + '(?!pkgrel)' + oldpkgcheck = re.compile( re.escape(i) + "-" + self.epoch + '(pkgver|[\d.]+)' + "-" + '(?!pkgrel)' ) + dirlist = os.listdir(self.DOCROOT) for n in dirlist: if n.startswith(i): @@ -588,7 +590,7 @@ class Packagefile(object): sys.exit(2) i = self.pkglist[0] - oldpkgcheck = re.compile( i + "-" + self.epoch + '(pkgver|[\d.]+)' + "-" + '(?!pkgrel)' ) + oldpkgcheck = re.compile( re.escape(i) + "-" + self.epoch + '(pkgver|[\d.]+)' + "-" + '(?!pkgrel)' ) dirlist = os.listdir(SRCPKGHOME + "/" ) if self.pkgbase: # Remove old src package(s) from local copy |