Changeset 4861


Ignore:
Timestamp:
Jul 20, 2011, 4:03:57 PM (9 years ago)
Author:
pmmf
Message:

Fix changelog.gz location

Location:
packages/cm16/caixamagica-recovery
Files:
3 added
1 edited

Legend:

Unmodified
Added
Removed
  • packages/cm16/caixamagica-recovery/cmiffy/debdiff.patch

    r4854 r4861  
    82898289diff -Nru dell-recovery-0.98.1/Dell/recovery_backend.py caixamagica-recovery-0.98.1xcm1/Dell/recovery_backend.py
    82908290--- dell-recovery-0.98.1/Dell/recovery_backend.py       2011-04-07 23:41:38.000000000 +0100
    8291 +++ caixamagica-recovery-0.98.1xcm1/Dell/recovery_backend.py    2011-07-13 16:47:40.000000000 +0100
     8291+++ caixamagica-recovery-0.98.1xcm1/Dell/recovery_backend.py    2011-07-20 16:02:36.000000000 +0100
     8292@@ -281,7 +281,7 @@
     8293            If it does, check for any potential SRUs to apply to the recovery media
     8294         """
     8295     
     8296-        output = fetch_output(['zcat', '/usr/share/doc/dell-recovery/changelog.gz'])
     8297+        output = fetch_output(['zcat', '/usr/share/doc/caixamagica-recovery/changelog.gz'])
     8298         package_distro = output.split('\n')[0].split()[2].strip(';')
     8299     
     8300         with open(os.path.join(mount, '.disk', 'info')) as rfd:
    82928301@@ -292,15 +292,15 @@
    82938302             from debian_bundle import debian_support
     
    84038412 fi
    84048413 
     8414diff -Nru dell-recovery-0.98.1/ubiquity/dell-bootstrap.py caixamagica-recovery-0.98.1xcm1/ubiquity/dell-bootstrap.py
     8415--- dell-recovery-0.98.1/ubiquity/dell-bootstrap.py     2011-04-27 01:47:50.000000000 +0100
     8416+++ caixamagica-recovery-0.98.1xcm1/ubiquity/dell-bootstrap.py  2011-07-20 16:00:44.000000000 +0100
     8417@@ -1499,7 +1499,7 @@
     8418         bto_version = self.xml_obj.fetch_node_contents('iso')
     8419         bto_date = self.xml_obj.fetch_node_contents('date')
     8420         with misc.raised_privileges():
     8421-            dr_version = magic.check_version('dell-recovery')
     8422+            dr_version = magic.check_version('caixamagica-recovery')
     8423             ubi_version = magic.check_version('ubiquity')
     8424             self.xml_obj.replace_node_contents('bootstrap', dr_version)
     8425             self.xml_obj.replace_node_contents('ubiquity' , ubi_version)
     8426@@ -1825,7 +1825,7 @@
     8427 
     8428         if dual:
     8429             #we don't want EULA or dell-recovery in dual mode
     8430-            for package in ['dell-eula', 'dell-recovery']:
     8431+            for package in ['dell-eula', 'caixamagica-recovery']:
     8432                 try:
     8433                     to_install.remove(package)
     8434                     to_remove.append(package)
     8435@@ -1841,7 +1841,7 @@
     8436 
     8437         #install dell-recovery in non dual mode only if there is an RP
     8438         elif rec_part:
     8439-            to_install.append('dell-recovery')
     8440+            to_install.append('caixamagica-recovery')
     8441 
     8442             #block os-prober in grub-installer
     8443             os.rename('/usr/bin/os-prober', '/usr/bin/os-prober.real')
Note: See TracChangeset for help on using the changeset viewer.