diff options
| author | Michael Hanson <mihanson@linhes.org> | 2012-03-05 21:41:06 (GMT) |
|---|---|---|
| committer | Michael Hanson <mihanson@linhes.org> | 2012-03-05 21:41:06 (GMT) |
| commit | 93b7418f2782633d93661e6b67fe0766b328a7c7 (patch) | |
| tree | c7429364e4b5135b9dd627d7e591757cc1c5f3f5 | |
| parent | 24171bd1a79d6a2176f6df7a32d37146fa9b9306 (diff) | |
| download | linhes_dev-93b7418f2782633d93661e6b67fe0766b328a7c7.zip | |
mp.py: Gracefully handle split pkgbuilds without a pkgbase (0.7.3)
| -rwxr-xr-x | build_tools/bin/mp.py | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/build_tools/bin/mp.py b/build_tools/bin/mp.py index 9476f18..dfdec94 100755 --- a/build_tools/bin/mp.py +++ b/build_tools/bin/mp.py @@ -1,5 +1,5 @@ #!/usr/bin/env python2 -# Version 0.7.2 +# Version 0.7.3 import os import sys @@ -175,9 +175,9 @@ def bump_pkg(): print "Bumped " + pkgname + " release to " + str(new_pkgrel) if pkgbase: - SRCPKG = pkgbase + "-" + pkgver + "-" + str(new_pkgrel) + ".src.tar.gz" + SRCPKG = pkgbase + "-" + epoch + pkgver + "-" + str(new_pkgrel) + ".src.tar.gz" else: - SRCPKG = pkgname + "-" + pkgver + "-" + str(new_pkgrel) + ".src.tar.gz" + SRCPKG = pkglist[0] + "-" + epoch + pkgver + "-" + str(new_pkgrel) + ".src.tar.gz" print "Source package will be: ",SRCPKG def find_repo(): @@ -287,8 +287,8 @@ def update_src_pkg(): SRCPKG = pkgbase + "-" + epoch + pkgver + "-" + pkgrel + ".src.tar.gz" i = pkgbase else: - SRCPKG = pkgname + "-" + epoch + pkgver + "-" + pkgrel + ".src.tar.gz" - i = pkgname + SRCPKG = pkglist[0] + "-" + epoch + pkgver + "-" + pkgrel + ".src.tar.gz" + i = pkglist[0] print "Source package will be:",SRCPKG if not SRCPKGHOME + "/" + REPO + "/" + SRCPKG: @@ -420,16 +420,15 @@ def config_file(): elif item == "epoch": if value: epoch = "%s:" %value - print "epoch" , epoch + print "epoch:" , epoch elif item == "arch": arch = value print "arch:",arch - if pkgbase: SRCPKG = pkgbase + "-" + epoch + pkgver + "-" + pkgrel + ".src.tar.gz" else: - SRCPKG = pkgname + "-" + epoch + pkgver + "-" + pkgrel + ".src.tar.gz" + SRCPKG = pkglist[0] + "-" + epoch + pkgver + "-" + pkgrel + ".src.tar.gz" print "Source package will be:",SRCPKG # Get needed makepkg.conf variables |