rpms/fwbackups/F-9 fwbackups-1.43.2rc2-import-lowercase.patch, NONE, 1.1 fwbackups.spec, 1.15, 1.16
Stewart Adam (firewing)
fedora-extras-commits at redhat.com
Sun Jun 22 17:42:51 UTC 2008
Author: firewing
Update of /cvs/extras/rpms/fwbackups/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27776/F-9
Modified Files:
fwbackups.spec
Added Files:
fwbackups-1.43.2rc2-import-lowercase.patch
Log Message:
Add import patch
fwbackups-1.43.2rc2-import-lowercase.patch:
--- NEW FILE fwbackups-1.43.2rc2-import-lowercase.patch ---
--- config.py
+++ config.py
@@ -227,7 +227,8 @@ class BackupSetConf(ConfigFile):
# only if it's a version mismatch should we import
if oldVersion == fwbackups.__version__:
- return self.set('General', 'Version', fwbackups.__version__)
+ self.set('General', 'Version', fwbackups.__version__)
+ return True
# This lets us do what needs to be done for version X and _above_
fromHereUp = False
@@ -239,10 +240,10 @@ class BackupSetConf(ConfigFile):
# I had changed the cron format in the .conf file in beta2/3? Don't remember
if oldVersion == '1.43' or oldVersion.startswith('1.43.0') or fromHereUp == True:
fromHereUp = True
- cron = self.get('Times', 'Entry').split(' ')
+ cron = self.get('Times', 'entry').split(' ')
tempCron = cron[:5]
tempCron.append('fwbackups-run')
- self.set('Times', 'Entry', ' '.join(tempCron))
+ self.set('Times', 'entry', ' '.join(tempCron))
# Just so we do the below
if oldVersion.startswith('1.43.0beta') or oldVersion == '1.43.0rc1' \
@@ -252,9 +253,9 @@ class BackupSetConf(ConfigFile):
# I added sparse & nice & excludes in 1.43.0rc3
if oldVersion == '1.43.0rc2' or fromHereUp == True:
fromHereUp = True
- self.set('Options', 'Excludes', '')
- self.set('Options', 'Nice', 0)
- self.set('Options', 'Sparse', 0)
+ self.set('Options', 'excludes', '')
+ self.set('Options', 'nice', 0)
+ self.set('Options', 'sparce', 0)
# Just so we do the below
if oldVersion == '1.43.0rc3' or fromHereUp == True:
@@ -263,7 +264,7 @@ class BackupSetConf(ConfigFile):
# I added follow links in 1.43.1
if oldVersion == '1.43.0' or fromHereUp == True:
fromHereUp = True
- self.set('Options', 'FollowLinks', '0')
+ self.set('Options', 'followlinks', '0')
# excludes became newline-separated in 1.43.2
# I messed up the import in 1.43.1 for followlinks
@@ -271,16 +272,16 @@ class BackupSetConf(ConfigFile):
fromHereUp = True
found = False
for i in self.options('Options'):
- if i == 'FollowLinks':
+ if i == 'followlinks':
found = True
if not found:
- self.set('Options', 'FollowLinks', '0')
- self.set('Options', 'DestinationType', 'local')
- self.set('Options', 'RemoteHost', '')
- self.set('Options', 'RemotePort', '22')
- self.set('Options', 'RemoteUsername', '')
- self.set('Options', 'RemotePassword', '')
- self.set('Options', 'RemoteFolder', '')
+ self.set('Options', 'followlinks', '0')
+ self.set('Options', 'destinationtype', 'local')
+ self.set('Options', 'remotehost', '')
+ self.set('Options', 'remoteport', '22')
+ self.set('Options', 'remoteusername', '')
+ self.set('Options', 'remotepassword', '')
+ self.set('Options', 'remotefolder', '')
# Just so we do the below
if oldVersion == '1.43.2beta1' or oldVersion == '1.43.2beta1' \
@@ -311,7 +313,9 @@ class BackupSetConf(ConfigFile):
if oldVersion == '1.43.2rc1' or fromHereUp == True:
self.set('Options', 'Incremental', '0')
- return self.set('General', 'Version', fwbackups.__version__)
+ self.set('General', 'Version', fwbackups.__version__)
+ self.write()
+ return True
class OneTimeConf(ConfigFile):
""" One-Time backup configuration file """
@@ -435,7 +439,7 @@ class PrefsConf(ConfigFile):
oldVersion = self.get('General', 'version')
# only if it's a version mismatch should we import
if oldVersion == fwbackups.__version__:
- return
+ return True
# This lets us do what needs to be done for version X and _above_
@@ -450,9 +454,9 @@ class PrefsConf(ConfigFile):
# (don't show me) in 1.43.2beta1
if oldVersion == '1.43.1' or fromHereUp == True:
fromHereUp = True
- self.set('Preferences', 'AlwaysShowDebug', 0)
- self.set('Preferences', 'pycronLoc', 'C:\\Program Files\\pycron')
- self.set('Preferences', 'DontShowMe_NetConnectUnresponsive', 0)
+ self.set('Preferences', 'alwaysshowdebug', 0)
+ self.set('Preferences', 'pycronloc', 'C:\\Program Files\\pycron')
+ self.set('Preferences', 'dontshowme_netconnectunresponsive', 0)
# just do the other stuff
if oldVersion == '1.43.2beta1' or fromHereUp == True:
Index: fwbackups.spec
===================================================================
RCS file: /cvs/extras/rpms/fwbackups/F-9/fwbackups.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- fwbackups.spec 19 Jun 2008 03:31:31 -0000 1.15
+++ fwbackups.spec 22 Jun 2008 17:42:06 -0000 1.16
@@ -6,7 +6,7 @@
Name: fwbackups
Version: 1.43.2
#Release: 1%{?dist}
-Release: 0.3.%{pretag}%{?dist}
+Release: 0.4.%{pretag}%{?dist}
BuildArch: noarch
Summary: A feature-rich user backup program
Group: Applications/Archiving
@@ -14,6 +14,7 @@
URL: http://www.diffingo.com/content/view/12/45/lang,en/
#Source0: http://www.diffingo.com/downloads/fwbackups/fwbackups-%{version}.tar.gz
Source0: http://www.diffingo.com/downloads/fwbackups/fwbackups-%{version}%{pretag}.tar.gz
+Patch0: fwbackups-1.43.2rc2-import-lowercase.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
@@ -41,9 +42,9 @@
%setup -q -n %{name}-%{version}%{pretag}
# uncomment me as needed
-#pushd src/fwbackups
-#patch0
-#popd
+pushd src/fwbackups
+%patch0
+popd
%build
%configure
@@ -79,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.4.rc2
+- Add patch to fix _import() functions
+
* Wed Jun 18 2008 Stewart Adam <s.adam at diffingo.com> 1.43.2-0.3.rc2
- Requires python-paramiko, not build requires!
More information about the scm-commits
mailing list