rpms/system-config-vsftpd/devel system-config-vsftpd-0.4.5-fix_log.patch, NONE, 1.1 system-config-vsftpd.spec, 1.1, 1.2
Maros Barabas (mbarabas)
fedora-extras-commits at redhat.com
Thu Oct 25 13:07:02 UTC 2007
Author: mbarabas
Update of /cvs/extras/rpms/system-config-vsftpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16984
Modified Files:
system-config-vsftpd.spec
Added Files:
system-config-vsftpd-0.4.5-fix_log.patch
Log Message:
* Thu Oct 25 2007 Maros Barabas <mbarabas at redhat.com> - 0.4.5-2
- fix problems with parsing file names with spaces in Transfer log
system-config-vsftpd-0.4.5-fix_log.patch:
--- NEW FILE system-config-vsftpd-0.4.5-fix_log.patch ---
diff -up trunk/src/confChoice.py.old trunk/src/confChoice.py
--- trunk/src/confChoice.py.old 2007-10-25 14:43:00.000000000 +0200
+++ trunk/src/confChoice.py 2007-08-30 14:53:14.000000000 +0200
@@ -85,19 +85,6 @@ class makeChoice:
return self.file
-class makeDefinePatch:
-
- def close_application( self, widget, event, data=None ):
- self.file = self.textBox.get_text( )
- self.window.hide( )
- return self.file
-
- def __init__( self, parent ):
-
- pass
-
-
-
def main():
gtk.main()
return 0
diff -up trunk/src/render.py.old trunk/src/render.py
--- trunk/src/render.py.old 2007-10-25 14:43:00.000000000 +0200
+++ trunk/src/render.py 2007-10-25 14:01:21.000000000 +0200
@@ -1753,10 +1753,10 @@ class ExperimentalLog( renderMainWindow
for __line in __pLines:
i = i + 1
# if ? on user identification
- if __line[0][9][0] == "?": user = "ftp"
- else: user = __line[0][9]
+ if __line[9][0] == "?" or __line[9][0] == ' ': user = "ftp"
+ else: user = __line[9]
- if __line[0][7][0] == "i":
- self.__fileListStore.append( [__line[0][0],__ico_download,user,`__line[0][4]`] )
- else: self.__fileListStore.append( [__line[0][0],__ico_upload,user,`__line[0][4]`] )
+ if __line[7][0] == "i":
+ self.__fileListStore.append( [__line[0],__ico_download,user,`__line[4]`] )
+ else: self.__fileListStore.append( [__line[0],__ico_upload,user,`__line[4]`] )
diff -up trunk/src/logs.py.old trunk/src/logs.py
--- trunk/src/logs.py.old 2007-10-25 14:43:00.000000000 +0200
+++ trunk/src/logs.py 2007-10-25 14:01:42.000000000 +0200
@@ -71,24 +71,36 @@ class Log:
r"(\d+ )" # Transfer time
r"([-a-zA-Z0-9\.]+ )" # hostname or IP ----
r"(\d+ )" # Transfer bytes
- r"(.* )" # filename ----
- r"([ab] )" # transfer type
- r"(. )" # special flag
- r"([io] )" # direction of transfer ----
- r"([ar] )" # access mode anonymous/real
- r"([a-zA-Z0-9\?\@]+ )" # identification of user
- r"([a-z]+ )" # service name
- r"([-a-zA-Z0-9]+ )" # authentification
- r"(.+ )" # auth user_id
- r"([c,i])" # completion status
- )
+ r"(.*)" # other
+ )
+ reg2exp = re.compile( r"([c,i])" # completion status
+ r"( .+)" # auth user_id
+ r"( [-a-zA-Z0-9]+)" # authentification
+ r"( [a-z]+)" # service name
+ r"( [a-zA-Z0-9\?\@]*)" # identification of user
+ r"( [ar])" # access mode anonymous/real
+ r"( [io])" # direction of transfer ----
+ r"( .)" # special flag
+ r"( [ab])" # transfer type
+ r"(.*)" # filename ----
+ )
ret = []
for line in self.dict[ day ][ ip ]:
- result = regexp.findall( line )
+ final_part1 = regexp.findall( line )
+ exp = final_part1[0][-1][::-1]
+ result2 = reg2exp.findall( exp )
+ result2[0] = result2[0][::-1]
+
+ final_part2 = []
+
+ for item in result2[0]:
+ final_part2.append(item[::-1])
+
+ result = list(final_part1[0][:4]) + final_part2
+
if len( result ) != 0: ret.append( result )
- #print result
return ret
def get_month_number( self, month ):
diff -up trunk/src/shell.py.old trunk/src/shell.py
--- trunk/src/shell.py.old 2007-10-25 14:43:00.000000000 +0200
+++ trunk/src/shell.py 2007-08-30 14:53:14.000000000 +0200
@@ -106,5 +106,3 @@ class Shell:
return None
-
-
Index: system-config-vsftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/system-config-vsftpd/devel/system-config-vsftpd.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- system-config-vsftpd.spec 6 Sep 2007 13:29:00 -0000 1.1
+++ system-config-vsftpd.spec 25 Oct 2007 13:06:28 -0000 1.2
@@ -8,6 +8,7 @@
URL: http://vsftpd-config.sf.net
Source0: http://downloads.sourceforge.net/vsftpd-config/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch1: system-config-vsftpd-0.4.5-fix_log.patch
BuildRequires: desktop-file-utils, gettext, intltool, python
BuildArch: noarch
@@ -19,6 +20,7 @@
%prep
%setup -q -n %{name}-%{version}
+%patch1 -p1 -b .fix_log
%build
make %{?_smp_mflags}
@@ -69,6 +71,9 @@
%attr(0644,root,root) %config(noreplace) /etc/pam.d/%{name}
%changelog
+* Thu Oct 25 2007 Maros Barabas <mbarabas at redhat.com> - 0.4.5-2
+- fix problems with parsing file names with spaces in Transfer log
+
* Tue Aug 28 2007 Maros Barabas <mbarabas at redhat.com> - 0.4.5-1
- fix review bugs
- Resolve: #253858 (bugzilla.redhat.com)
More information about the fedora-extras-commits
mailing list