[oe-commits] Chris Larson : package_ipk.bbclass: don't choke on empty SRC_URI.

git version control git at git.openembedded.org
Wed Aug 26 03:01:59 UTC 2009


Module: openembedded.git
Branch: org.openembedded.dev
Commit: 482e70f47fed52f27c83cc41e6bdeeb8ad36c779
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=482e70f47fed52f27c83cc41e6bdeeb8ad36c779

Author: Chris Larson <clarson at kergoth.com>
Date:   Wed Aug 26 03:58:03 2009 -0700

package_ipk.bbclass: don't choke on empty SRC_URI.

Signed-off-by: Chris Larson <clarson at kergoth.com>

---

 classes/package_ipk.bbclass |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass
index e3a7522..e556108 100644
--- a/classes/package_ipk.bbclass
+++ b/classes/package_ipk.bbclass
@@ -266,10 +266,9 @@ python do_package_ipk () {
 			ctrlfile.write("Replaces: %s\n" % ", ".join(rreplaces))
 		if rconflicts:
 			ctrlfile.write("Conflicts: %s\n" % ", ".join(rconflicts))
-		src_uri = bb.data.getVar("SRC_URI", localdata, 1)
-		if src_uri:
-			src_uri = re.sub("\s+", " ", src_uri)
-			ctrlfile.write("Source: %s\n" % " ".join(src_uri.split()))
+		src_uri = bb.data.getVar("SRC_URI", localdata, 1) or d.getVar("FILE", True)
+		src_uri = re.sub("\s+", " ", src_uri)
+		ctrlfile.write("Source: %s\n" % " ".join(src_uri.split()))
 		ctrlfile.close()
 
 		for script in ["preinst", "postinst", "prerm", "postrm"]:





More information about the Openembedded-commits mailing list