[Sisuite-devel] FW: [systemimager-commits] r3402 - tags/3.7.0/lib/SystemImager

[Bernard Li]

Title: [systemimager-commits] r3402 - tags/3.7.0/lib/SystemImager

Hey Andrea:

 

I was talking to Brian on Friday and he mentioned that it is better not to check code into all the branches - just check it into the most relevant one (I guess in this case branch/3.6.x since it is a bugfix) and everything will be merged in when we do the merging between branch/3.6.x, tag/3.7.0 and trunk, etc.

 

This is because it may cause conflicts when the change exists in all the branches.

 

Cheers,

 

Bernard

---

From: [EMAIL PROTECTED] on behalf of Andrea Righi
Sent: Tue 10/01/2006 04:36
To: [EMAIL PROTECTED]
Subject: [systemimager-commits] r3402 - tags/3.7.0/lib/SystemImager

Author: arighi
Date: 2006-01-10 06:36:16 -0600 (Tue, 10 Jan 2006)
New Revision: 3402

Modified:
   tags/3.7.0/lib/SystemImager/Server.pm
Log:
- fix: do not skip devices that are not mapped into %dev2disk (some LVM devices may be excluded otherwise)


Modified: tags/3.7.0/lib/SystemImager/Server.pm
===================================================================
--- tags/3.7.0/lib/SystemImager/Server.pm       2006-01-10 12:33:53 UTC (rev 3401)
+++ tags/3.7.0/lib/SystemImager/Server.pm       2006-01-10 12:36:16 UTC (rev 3402)
@@ -1413,8 +1413,9 @@
             print $out qq(mkraid --really-force $real_dev || shellout\n)
                 unless (defined($xml_config->{raid}));
         } elsif( $real_dev =~ /^(.*?)(p?\d+)$/ ) {
-            unless($dev2disk{$1}) { next; }
-            $real_dev = "\${".$dev2disk{$1}."}".$2;
+            if ($dev2disk{$1}) {
+                $real_dev = "\${".$dev2disk{$1}."}".$2;
+            }
         }

         # swap



-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems?  Stop!  Download the new AJAX search engine that makes
searching your log files as easy as surfing the  web.  DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
systemimager-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/systemimager-commits