[Tizen-submit] 16269: Changes to Tizen:Mobile/pkgmgr

noreply at tizen.org noreply at tizen.org
Mon Oct 21 22:44:52 GMT 2013


Hi,
Patrick McCarty have made the following changes to pkgmgr in project Tizen:Mobile. Please review and accept ASAP.

Thank You,

[This message was auto-generated]

---

Request: #16269

  submit:       Tizen:Mobile:build/pkgmgr(cleanup) -> Tizen:Mobile


Message:
Submitter: Patrick McCarty <patrick.mccarty at linux.intel.com>
Comments: uncomment code that was causing a crash in amd; fix a build link ordering issue; fix PTREL-133
Git project: platform/core/appfw/slp-pkgmgr
Tag: submit/tizen/20131021.224902
Commit: beedaae7631442f1cce2f52c8ae963fb9357ce0b Revert workaround and fix build issue

State:   new        2013-10-21T22:46:16 tizenrobot
Comment: <no comment>
changes files:
--------------

spec files:
-----------
--- pkgmgr.spec
+++ pkgmgr.spec
@@ -4,7 +4,7 @@
 Summary:    Packager Manager client library package
 Version:    0.2.89
 Release:    1
-VCS:        platform/core/appfw/slp-pkgmgr#submit/tizen/20131015.102630-0-g2b811ac65b2d7af0d61d95a844b4b255815bd99b
+VCS:        platform/core/appfw/slp-pkgmgr#submit/tizen/20131021.224902-0-gbeedaae7631442f1cce2f52c8ae963fb9357ce0b
 Group:      Application Framework/Package Management
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz

other changes:
--------------

++++++ pkgmgr-0.2.89.tar.gz
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -28,16 +28,16 @@
 OPTION(X11_SUPPORT "Enable X support" ON)
 IF(X11_SUPPORT)
     ADD_DEFINITIONS("-DHAVE_X11")
-    pkg_check_modules(pkgs REQUIRED security-server dlog elementary evas ecore appcore-efl ecore-x ail ecore-file pkgmgr-info iniparser)
+    pkg_check_modules(pkgs REQUIRED security-server dlog elementary evas ecore appcore-efl ecore-x ail ecore-file pkgmgr-parser pkgmgr-info iniparser)
 ELSE()
-    pkg_check_modules(pkgs REQUIRED security-server dlog elementary evas ecore appcore-efl ecore-wayland ail ecore-file pkgmgr-info iniparser)
+    pkg_check_modules(pkgs REQUIRED security-server dlog elementary evas ecore appcore-efl ecore-wayland ail ecore-file pkgmgr-parser pkgmgr-info iniparser)
 ENDIF(X11_SUPPORT)
 
 FOREACH(flag ${pkgs_CFLAGS})
 	SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
 ENDFOREACH(flag)
 
-pkg_check_modules(libpkgs REQUIRED dbus-glib-1 dlog ail pkgmgr-info iniparser)
+pkg_check_modules(libpkgs REQUIRED dbus-glib-1 dlog ail pkgmgr-parser pkgmgr-info iniparser)
 
 FOREACH(flag ${libpkgs_CFLAGS})
 	SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
--- server/src/pkgmgr-server.c
+++ server/src/pkgmgr-server.c
@@ -1686,9 +1686,7 @@
 			} else { /* in case of package */
 				DBGE("(De)activate PKG[pkgid=%s, val=%d]", item->pkgid, val);
 				char *manifest = NULL;
-				
-                                // FIXME!!!! pkgmgr_parser_get_manifest_file does not exist!
-                                //manifest = pkgmgr_parser_get_manifest_file(item->pkgid);
+				manifest = pkgmgr_parser_get_manifest_file(item->pkgid);
 				if (manifest == NULL) {
 					DBGE("Failed to fetch package manifest file\n");
 					exit(1);
@@ -1697,12 +1695,9 @@
 
 				if (val) {
 					pkgmgrinfo_pkginfo_h handle;
-
 					ret = pkgmgrinfo_pkginfo_get_pkginfo(item->pkgid, &handle);
 					if (ret < 0) {
-                                                // FIXME!!!! pkgmgr_parser_parse_manifest_for_installation does not exist!
-						// ret = pkgmgr_parser_parse_manifest_for_installation(manifest, NULL);
-                                                ret = -1;
+						ret = pkgmgr_parser_parse_manifest_for_installation(manifest, NULL);
 						if (ret < 0) {
 							DBGE("insert in db failed\n");
 						}
@@ -1730,9 +1725,7 @@
 					}
 				}
 				else
-                                        // FIXME!!!! pkgmgr_parser_parse_manifest_for_uninstallation does not exist!
-                                        ret = -1;
-					//ret = pkgmgr_parser_parse_manifest_for_uninstallation(manifest, NULL);
+					ret = pkgmgr_parser_parse_manifest_for_uninstallation(manifest, NULL);
 
 				if (ret < 0) {
 					DBGE("insert in db failed\n");
--- tool/CMakeLists.txt
+++ tool/CMakeLists.txt
@@ -5,12 +5,12 @@
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/client/include)
 

Please refer to OBS webUI for more details about this SR.


More information about the Tizen-submit mailing list