[prev in list] [next in list] [prev in thread] [next in thread] 

List:       klik-devel
Subject:    [klik-devel] [klikclient commit] r1603 -
From:       codesite-noreply () google ! com
Date:       2008-06-19 7:47:41
Message-ID: 000e0cd156461f09010450003119 () google ! com
[Download RAW message or body]

Author: razielmine
Date: Thu Jun 19 00:46:38 2008
New Revision: 1603

Modified:
   trunk/client/trunk/klikclient/lib/klik/cmg.py
   trunk/client/trunk/klikclient/lib/klik/execute.py
   trunk/client/trunk/klikclient/lib/klik/fuse.py

Log:
Tried to fix klik1 compatibility but it would take a while, we are 
trying to get its recipe.

Modified: trunk/client/trunk/klikclient/lib/klik/cmg.py
==============================================================================
--- trunk/client/trunk/klikclient/lib/klik/cmg.py	(original)
+++ trunk/client/trunk/klikclient/lib/klik/cmg.py	Thu Jun 19 00:46:38 2008
@@ -148,6 +148,8 @@
 		return 0, "Cancelled"

 	def get_recipe(self):
+                if self.__cmg_version == 1:
+                        exit( "cmg.py:get_recipe() FIXME: Avoid 
getting the recipe of a klik1 package" )
 		if not self.__recipe:
 			temp_path = self.extract_file("/recipe.xml")
 			try:

Modified: trunk/client/trunk/klikclient/lib/klik/execute.py
==============================================================================
--- trunk/client/trunk/klikclient/lib/klik/execute.py	(original)
+++ trunk/client/trunk/klikclient/lib/klik/execute.py	Thu Jun 19 
00:46:38 2008
@@ -56,7 +56,7 @@

 	def extract_file(self, cmg, file_path_from, file_path_to):
 		# Extract a single file
-		mount_point_path = self.mount_cmg(cmg.path, True)
+		mount_point_path = self.mount_cmg(cmg, True)
 		shutil.copy(os.path.join(mount_point_path, file_path_from), file_path_to)
 		self.umnount_cmg (mount_point_path)


Modified: trunk/client/trunk/klikclient/lib/klik/fuse.py
==============================================================================
--- trunk/client/trunk/klikclient/lib/klik/fuse.py	(original)
+++ trunk/client/trunk/klikclient/lib/klik/fuse.py	Thu Jun 19 00:46:38 2008
@@ -36,7 +36,6 @@
 		self.klik = klik

 	def mount_cmg(self, cmg, union=True, reusable_mount_point=False):
-                print cmg, type(cmg)
                 version = cmg.is_valid_cmg()
 		if version == 2:
 			cmg.mount_point_path = self.__mount_iso(cmg, union, reusable_mount_point)
_______________________________________________
klik-devel mailing list
klik-devel@kde.org
https://mail.kde.org/mailman/listinfo/klik-devel
[prev in list] [next in list] [prev in thread] [next in thread]