summaryrefslogtreecommitdiff
path: root/noncore/settings/aqpkg/ipkg.cpp
authorandyq <andyq>2002-10-22 18:00:55 (UTC)
committer andyq <andyq>2002-10-22 18:00:55 (UTC)
commitd7cca919f20d602bd755b7690c25e31f6e9520b1 (patch) (unidiff)
treeb5ffe24d905ace7563c21be0eea06b39402430aa /noncore/settings/aqpkg/ipkg.cpp
parent6843a1bd8f8e679c220431f8377abcd2ffd2019b (diff)
downloadopie-d7cca919f20d602bd755b7690c25e31f6e9520b1.zip
opie-d7cca919f20d602bd755b7690c25e31f6e9520b1.tar.gz
opie-d7cca919f20d602bd755b7690c25e31f6e9520b1.tar.bz2
Changed so that refreshing server packages shows status dialog
Diffstat (limited to 'noncore/settings/aqpkg/ipkg.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/aqpkg/ipkg.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/noncore/settings/aqpkg/ipkg.cpp b/noncore/settings/aqpkg/ipkg.cpp
index 02d4258..eacef76 100644
--- a/noncore/settings/aqpkg/ipkg.cpp
+++ b/noncore/settings/aqpkg/ipkg.cpp
@@ -84,50 +84,51 @@ bool Ipkg :: runIpkg( )
84 // if destDir is NOT / 84 // if destDir is NOT /
85 if ( flags & MAKE_LINKS ) 85 if ( flags & MAKE_LINKS )
86 { 86 {
87 // If destDir == / turn off make links as package is being insalled 87 // If destDir == / turn off make links as package is being insalled
88 // to root already. 88 // to root already.
89 if ( destDir == "/" ) 89 if ( destDir == "/" )
90 flags ^= MAKE_LINKS; 90 flags ^= MAKE_LINKS;
91 } 91 }
92 } 92 }
93 93
94#ifdef X86 94#ifdef X86
95 cmd += " -f "; 95 cmd += " -f ";
96 cmd += IPKG_CONF; 96 cmd += IPKG_CONF;
97#endif 97#endif
98 98
99 99
100 if ( option == "reinstall" ) 100 if ( option == "reinstall" )
101 cmd += " install"; 101 cmd += " install";
102 else 102 else
103 cmd += " " + option; 103 cmd += " " + option;
104 if ( option != "upgrade" ) 104 if ( option != "upgrade" )
105 cmd += " " + package; 105 cmd += " " + package;
106 cmd += " 2>&1"; 106 cmd += " 2>&1";
107 107
108 108
109 emit outputText( QString( "Dealing with package " ) + package ); 109 if ( package != "" )
110 emit outputText( QString( "Dealing with package " ) + package );
110 111
111 qApp->processEvents(); 112 qApp->processEvents();
112 113
113 // If we are removing packages and make links option is selected 114 // If we are removing packages and make links option is selected
114 // create the links 115 // create the links
115 if ( option == "remove" || option == "reinstall" ) 116 if ( option == "remove" || option == "reinstall" )
116 { 117 {
117 createLinks = false; 118 createLinks = false;
118 if ( flags & MAKE_LINKS ) 119 if ( flags & MAKE_LINKS )
119 { 120 {
120 emit outputText( QString( "Removing symbolic links...\n" ) ); 121 emit outputText( QString( "Removing symbolic links...\n" ) );
121 linkPackage( Utils::getPackageNameFromIpkFilename( package ), destination, destDir ); 122 linkPackage( Utils::getPackageNameFromIpkFilename( package ), destination, destDir );
122 emit outputText( QString( " " ) ); 123 emit outputText( QString( " " ) );
123 } 124 }
124 } 125 }
125 126
126 emit outputText( cmd ); 127 emit outputText( cmd );
127 128
128 // Execute command 129 // Execute command
129 dependantPackages = new QList<QString>; 130 dependantPackages = new QList<QString>;
130 dependantPackages->setAutoDelete( true ); 131 dependantPackages->setAutoDelete( true );
131 132
132 ret = executeIpkgCommand( cmd, option ); 133 ret = executeIpkgCommand( cmd, option );
133 134