rpms/fwbackups/devel fwbackups-1.43.2rc2-import-lowercase.patch, 1.1, 1.2 fwbackups.spec, 1.16, 1.17
Stewart Adam (firewing)
fedora-extras-commits at redhat.com
Sun Jun 22 22:41:04 UTC 2008
Author: firewing
Update of /cvs/extras/rpms/fwbackups/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4198/devel
Modified Files:
fwbackups-1.43.2rc2-import-lowercase.patch fwbackups.spec
Log Message:
Update patch
fwbackups-1.43.2rc2-import-lowercase.patch:
Index: fwbackups-1.43.2rc2-import-lowercase.patch
===================================================================
RCS file: /cvs/extras/rpms/fwbackups/devel/fwbackups-1.43.2rc2-import-lowercase.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fwbackups-1.43.2rc2-import-lowercase.patch 22 Jun 2008 17:42:22 -0000 1.1
+++ fwbackups-1.43.2rc2-import-lowercase.patch 22 Jun 2008 22:40:16 -0000 1.2
@@ -70,7 +70,39 @@
# Just so we do the below
if oldVersion == '1.43.2beta1' or oldVersion == '1.43.2beta1' \
-@@ -311,7 +313,9 @@ class BackupSetConf(ConfigFile):
+@@ -291,27 +292,33 @@ class BackupSetConf(ConfigFile):
+ if oldVersion == '1.43.2beta3' or fromHereUp == True:
+ fromHereUp = True
+ for option in self.options('Paths'):
+- self.set('Paths', option.title(), self.get('Paths', option))
+- self.remove_option('Paths', option.lower())
++ if not self.has_option('Paths', option):
++ self.set('Paths', option.title(), self.get('Paths', option))
++ self.remove_option('Paths', option.lower())
+ for option in ['Version', 'Type']:
+- self.set('General', option, self.get('General', option.lower()))
+- self.remove_option('General', option.lower())
++ if not self.has_option('General', option):
++ self.set('General', option, self.get('General', option.lower()))
++ self.remove_option('General', option.lower())
+ for option in ['Custom', 'Entry']:
+- self.set('Times', option, self.get('Times', option.lower()))
+- self.remove_option('Times', option.lower())
++ if not self.has_option('Times', option):
++ self.set('Times', option, self.get('Times', option.lower()))
++ self.remove_option('Times', option.lower())
+ for option in ['Enabled', 'CommandBefore', 'CommandAfter', 'OldToKeep',
+ 'DestinationType', 'Destination', 'Recursive',
+ 'PkgListsToFile', 'DiskInfoToFile', 'BackupHidden',
+ 'Engine', 'Sparse', 'Nice', 'Excludes', 'FollowLinks',
+ 'RemoteHost', 'RemotePort', 'RemoteUsername',
+ 'RemotePassword', 'RemoteFolder']:
+- self.set('Options', option, self.get('Options', option.lower()))
+- self.remove_option('Options', option.lower())
++ if not self.has_option('Options', option):
++ self.set('Options', option, self.get('Options', option.lower()))
++ self.remove_option('Options', option.lower())
+
if oldVersion == '1.43.2rc1' or fromHereUp == True:
self.set('Options', 'Incremental', '0')
@@ -81,7 +113,7 @@
class OneTimeConf(ConfigFile):
""" One-Time backup configuration file """
-@@ -435,7 +439,7 @@ class PrefsConf(ConfigFile):
+@@ -435,7 +442,7 @@ class PrefsConf(ConfigFile):
oldVersion = self.get('General', 'version')
# only if it's a version mismatch should we import
if oldVersion == fwbackups.__version__:
@@ -90,7 +122,7 @@
# This lets us do what needs to be done for version X and _above_
-@@ -450,9 +454,9 @@ class PrefsConf(ConfigFile):
+@@ -450,9 +457,9 @@ class PrefsConf(ConfigFile):
# (don't show me) in 1.43.2beta1
if oldVersion == '1.43.1' or fromHereUp == True:
fromHereUp = True
Index: fwbackups.spec
===================================================================
RCS file: /cvs/extras/rpms/fwbackups/devel/fwbackups.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- fwbackups.spec 22 Jun 2008 17:42:22 -0000 1.16
+++ fwbackups.spec 22 Jun 2008 22:40:16 -0000 1.17
@@ -6,7 +6,7 @@
Name: fwbackups
Version: 1.43.2
#Release: 1%{?dist}
-Release: 0.4.%{pretag}%{?dist}
+Release: 0.5.%{pretag}%{?dist}
BuildArch: noarch
Summary: A feature-rich user backup program
Group: Applications/Archiving
@@ -80,6 +80,9 @@
%doc AUTHORS COPYING ChangeLog NEWS TODO README
%changelog
+* Sun Jun 22 2008 Stewart Adam <s.adam at diffingo.com> 1.43.2-0.5.rc2
+- Update patch to fix _import() functions
+
* Sun Jun 22 2008 Stewart Adam <s.adam at diffingo.com> 1.43.2-0.4.rc2
- Add patch to fix _import() functions
More information about the scm-commits
mailing list